[Libwpd-cvs] libwpd2/src/lib WP6ContentListener.cpp, 1.76, 1.77 WP6FileStructure.h, 1.55, 1.56

[Fridrich S. <str...@us...>]

Update of /cvsroot/libwpd/libwpd2/src/lib
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9152/src/lib

Modified Files:
	WP6ContentListener.cpp WP6FileStructure.h 
Log Message:
and also try to get it right

Index: WP6FileStructure.h
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6FileStructure.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- WP6FileStructure.h	22 Jun 2010 10:07:58 -0000	1.55
+++ WP6FileStructure.h	22 Jun 2010 10:14:17 -0000	1.56
@@ -301,18 +301,6 @@
 #define WP6_PARAGRAPH_JUSTIFICATION_FULL_ALL_LINES 0x04
 #define WP6_PARAGRAPH_JUSTIFICATION_RESERVED 0x05
 
-/* Display Number Reference Group */
-#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_USER_DEFINED_ON 0x00
-#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_USER_DEFINED_OFF 0x01
-//#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_CHAPTER_ON 0x08
-//#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_CHAPTER_OFF 0x09
-#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PARAGRAPH_NUMBER_ON 0x0C
-#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PARAGRAPH_NUMBER_OFF 0x0D
-#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_FOOTNOTE_NUMBER_ON 0x0E
-#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_FOOTNOTE_NUMBER_OFF 0x0F
-#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_ENDNOTE_NUMBER_ON 0x10
-#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_ENDNOTE_NUMBER_OFF 0x11
-
 /* Character Group */
 #define WP6_CHARACTER_GROUP_SET_ALIGNMENT_CHARACTER 0x00
 #define WP6_CHARACTER_GROUP_COLOR 0x18

Index: WP6ContentListener.cpp
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6ContentListener.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- WP6ContentListener.cpp	11 Jun 2010 15:24:51 -0000	1.76
+++ WP6ContentListener.cpp	22 Jun 2010 10:14:17 -0000	1.77
@@ -1037,8 +1037,8 @@
 	{
 		switch (subGroup)
 		{
-		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PARAGRAPH_NUMBER_ON:
-		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_USER_DEFINED_ON:
+		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PARAGRAPH_NUMBER_DISPLAY_ON:
+		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_USER_DEFINED_NUMBER_DISPLAY_ON:
 			// HACKISH: if we are in a paragraph style sequence we will pretend that paragraph numbering was
 			// just turned on even though it didn't happen
 			if (m_parseState->m_styleStateSequence.getCurrentState() == BEGIN_BEFORE_NUMBERING)
@@ -1056,8 +1056,8 @@
 			}
 			m_parseState->m_putativeListElementHasDisplayReferenceNumber = true;
 			break;
-		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_FOOTNOTE_NUMBER_ON:
-		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_ENDNOTE_NUMBER_ON:
+		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_FOOTNOTE_NUMBER_DISPLAY_ON:
+		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_ENDNOTE_NUMBER_DISPLAY_ON:
 			m_parseState->m_styleStateSequence.setCurrentState(DISPLAY_REFERENCING);
 			break;
 		}
@@ -1070,8 +1070,8 @@
 	{
 		switch (subGroup)
 		{
-		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PARAGRAPH_NUMBER_OFF:
-		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_USER_DEFINED_OFF:
+		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PARAGRAPH_NUMBER_DISPLAY_OFF:
+		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_USER_DEFINED_NUMBER_DISPLAY_OFF:
 			if (m_parseState->m_styleStateSequence.getPreviousState() == BEGIN_NUMBERING_BEFORE_DISPLAY_REFERENCING)
 				m_parseState->m_styleStateSequence.setCurrentState(BEGIN_NUMBERING_AFTER_DISPLAY_REFERENCING);
 			else {
@@ -1085,8 +1085,8 @@
 
 			}
 			break;
-		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_FOOTNOTE_NUMBER_OFF:
-		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_ENDNOTE_NUMBER_OFF:
+		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_FOOTNOTE_NUMBER_DISPLAY_OFF:
+		case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_ENDNOTE_NUMBER_DISPLAY_OFF:
 			m_parseState->m_styleStateSequence.setCurrentState(m_parseState->m_styleStateSequence.getPreviousState());
 			break;
 		}