[Libreoffice-commits] .: 3 commits - sw/inc sw/source

[Caolán McNamara]

 sw/inc/fldbas.hxx             |    4 ++--
 sw/inc/fldui.hrc              |   28 +++++++++++++++-------------
 sw/source/ui/fldui/fldmgr.cxx |    3 ++-
 3 files changed, 19 insertions(+), 16 deletions(-)

New commits:
commit 392f0990e4b7ef7338aa901735c7a6cc7632dd40
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 6 16:18:37 2011 +0000

    avoid assertion about spurious '0' translation id in field dialog

diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index e67d170..7cd374f 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -1648,7 +1648,8 @@ void SwFieldType::_GetFldName()
         STR_SCRIPTFLD,
         STR_AUTHORITY,
         STR_COMBINED_CHARS,
-        STR_DROPDOWN
+        STR_DROPDOWN,
+        STR_CUSTOM
     };
 
     // insert infos for fields
commit 84e6b5711978055be903f9541b4a9673cc07ed49
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 6 16:09:57 2011 +0000

    order these against SwFldTypesEnum

diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc
index 7853e0e..52aa0ee 100644
--- a/sw/inc/fldui.hrc
+++ b/sw/inc/fldui.hrc
@@ -45,7 +45,7 @@
 #define DLG_FLD_DROPDOWN    (RC_FLDDLG_BEGIN + 12)
 
 /*--------------------------------------------------------------------
-    TypeId
+    TypeId, see SwFldTypesEnum
  --------------------------------------------------------------------*/
 
 #define STR_TYPE_BEGIN      RC_FLDDLG_BEGIN
@@ -60,27 +60,28 @@
 #define STR_SETFLD          (STR_TYPE_BEGIN + 8)
 #define STR_GETFLD          (STR_TYPE_BEGIN + 9)
 #define STR_FORMELFLD       (STR_TYPE_BEGIN + 10)
-#define STR_CONDTXTFLD      (STR_TYPE_BEGIN + 11)
+#define STR_HIDDENTXTFLD    (STR_TYPE_BEGIN + 11)
 #define STR_SETREFFLD       (STR_TYPE_BEGIN + 12)
 #define STR_GETREFFLD       (STR_TYPE_BEGIN + 13)
 #define STR_DDEFLD          (STR_TYPE_BEGIN + 14)
 #define STR_MACROFLD        (STR_TYPE_BEGIN + 15)
 #define STR_INPUTFLD        (STR_TYPE_BEGIN + 16)
-#define STR_DOCINFOFLD      (STR_TYPE_BEGIN + 17)
+#define STR_HIDDENPARAFLD   (STR_TYPE_BEGIN + 17)
+#define STR_DOCINFOFLD      (STR_TYPE_BEGIN + 18)
 #define STR_DBFLD           (STR_TYPE_BEGIN + 19)
 #define STR_USERFLD         (STR_TYPE_BEGIN + 20)
 #define STR_POSTITFLD       (STR_TYPE_BEGIN + 21)
-#define STR_HIDDENPARAFLD   (STR_TYPE_BEGIN + 22)
-
-#define STR_TEMPLNAMEFLD    (STR_TYPE_BEGIN + 24)
-#define STR_SEQFLD          (STR_TYPE_BEGIN + 25)
-#define STR_DBNEXTSETFLD    (STR_TYPE_BEGIN + 26)
-#define STR_DBNUMSETFLD     (STR_TYPE_BEGIN + 27)
-#define STR_DBSETNUMBERFLD  (STR_TYPE_BEGIN + 28)
+#define STR_TEMPLNAMEFLD    (STR_TYPE_BEGIN + 22)
+#define STR_SEQFLD          (STR_TYPE_BEGIN + 23)
+#define STR_DBNEXTSETFLD    (STR_TYPE_BEGIN + 24)
+#define STR_DBNUMSETFLD     (STR_TYPE_BEGIN + 25)
+#define STR_DBSETNUMBERFLD  (STR_TYPE_BEGIN + 26)
+#define STR_CONDTXTFLD      (STR_TYPE_BEGIN + 27)
+#define STR_NEXTPAGEFLD     (STR_TYPE_BEGIN + 28)
 #define STR_PREVPAGEFLD     (STR_TYPE_BEGIN + 29)
-#define STR_NEXTPAGEFLD     (STR_TYPE_BEGIN + 30)
-#define STR_HIDDENTXTFLD    (STR_TYPE_BEGIN + 31)
-#define STR_EXTUSERFLD      (STR_TYPE_BEGIN + 32)
+#define STR_EXTUSERFLD      (STR_TYPE_BEGIN + 30)
+
+
 #define STR_SETINPUTFLD     (STR_TYPE_BEGIN + 33)
 #define STR_USRINPUTFLD     (STR_TYPE_BEGIN + 34)
 #define STR_SETREFPAGEFLD   (STR_TYPE_BEGIN + 35)
@@ -91,6 +92,7 @@
 #define STR_AUTHORITY       (STR_TYPE_BEGIN + 40)
 #define STR_COMBINED_CHARS  (STR_TYPE_BEGIN + 41)
 #define STR_DROPDOWN        (STR_TYPE_BEGIN + 42)
+
 #define STR_CUSTOM          (STR_TYPE_BEGIN + 43)
 #define STR_TYPE_END        (STR_TYPE_BEGIN + 44)
 
commit c4f865061837179caee0959791512f9ff9cf0876
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 6 16:07:26 2011 +0000

    comment of enum 40 misplaced

diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index fb3de9c..f865175 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -129,8 +129,8 @@ enum SwFldTypesEnum
     TYP_GETREFPAGEFLD,
     TYP_INTERNETFLD,
     TYP_JUMPEDITFLD,
-    TYP_SCRIPTFLD,              // 40
-    TYP_AUTHORITY,
+    TYP_SCRIPTFLD,
+    TYP_AUTHORITY,              // 40
     TYP_COMBINED_CHARS,
     TYP_DROPDOWN,
     TYP_END