[Libreoffice-commits] core.git: cui/uiconfig sw/source

[Katarina Behrens]

 cui/uiconfig/ui/numberingoptionspage.ui    |   32 ++++++++++++++---------------
 sw/source/ui/misc/numberingtypelistbox.src |    6 ++---
 2 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit fa9ac78d0c12b307c401bfede2cb08f89d0a15e3
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Mon Apr 27 18:56:19 2015 +0200

    tdf#69316: Sort numbering options meaningfully
    
    + unify terminology image vs. graphics
    
    In an ideal world, those strings wouldn't be duplicated in both sw
    and cui and change like this would be done in a single place. But
    there's currently no straightforward way how to share strings between
    those two ...
    
    Change-Id: I5311aca3e7b4070c82cf4f84f96ab1b6eff473c6

diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui
index c3430a6..5a1ed48 100644
--- a/cui/uiconfig/ui/numberingoptionspage.ui
+++ b/cui/uiconfig/ui/numberingoptionspage.ui
@@ -57,6 +57,22 @@
     </columns>
     <data>
       <row>
+        <col id="0" translatable="yes">None</col>
+        <col id="1">5</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Bullet</col>
+        <col id="1">6</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Graphics</col>
+        <col id="1">8</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Linked graphics</col>
+        <col id="1">136</col>
+      </row>
+      <row>
         <col id="0" translatable="yes">1, 2, 3, ...</col>
         <col id="1">4</col>
       </row>
@@ -85,22 +101,6 @@
         <col id="1">10</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bullet</col>
-        <col id="1">6</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Graphics</col>
-        <col id="1">8</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Linked graphics</col>
-        <col id="1">136</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">None</col>
-        <col id="1">5</col>
-      </row>
-      <row>
         <col id="0" translatable="yes">Native Numbering</col>
         <col id="1">12</col>
       </row>
diff --git a/sw/source/ui/misc/numberingtypelistbox.src b/sw/source/ui/misc/numberingtypelistbox.src
index a06c7a9..f7b23cc 100644
--- a/sw/source/ui/misc/numberingtypelistbox.src
+++ b/sw/source/ui/misc/numberingtypelistbox.src
@@ -26,6 +26,9 @@ Resource STRRES_NUMTYPES
 
         ItemList [ en-US ] =
         {
+            < "None" ;                      5/*SVX_NUM_NUMBER_NONE         */; > ;
+            < "Bullet" ;                    6/*SVX_NUM_CHAR_SPECIAL        */; > ;
+            < "Graphics" ;                  8/*SVX_NUM_BITMAP              */; > ;
             < "1, 2, 3, ..." ;              4/*SVX_NUM_ARABIC              */; > ;
             < "A, B, C, ..." ;              0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
             < "a, b, c, ..." ;              1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
@@ -33,9 +36,6 @@ Resource STRRES_NUMTYPES
             < "i, ii, iii, ..." ;           3/*SVX_NUM_ROMAN_LOWER         */; > ;
             < "A, .., AA, .., AAA, ..." ;   9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
             < "a, .., aa, .., aaa, ..." ;  10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            < "Bullet" ;                    6/*SVX_NUM_CHAR_SPECIAL        */; > ;
-            < "Image" ;                     8/*SVX_NUM_BITMAP              */; > ;
-            < "None" ;                      5/*SVX_NUM_NUMBER_NONE         */; > ;
             < "Native Numbering" ;                      12 /*NATIVE_NUMBERING                   */; > ;
             < "А, Б, .., Аа, Аб, ... (Bulgarian)" ;     38 /*CHARS_CYRILLIC_UPPER_LETTER_BG     */; > ;
             < "а, б, .., аа, аб, ... (Bulgarian)" ;     39 /*CHARS_CYRILLIC_LOWER_LETTER_BG     */; > ;