[Libreoffice-commits] core.git: svx/source

Caolán McNamara caolanm at redhat.com
Wed Mar 29 11:46:12 UTC 2017


 svx/source/dialog/swframeposstrings.src |   34 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 63da00becce1688ec6987e00199831e27ececc77
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 29 12:30:00 2017 +0100

    Resolves: tdf#106841 RID_SVXSW_FRAMEPOSITIONS is in wrong order
    
    since...
    
    commit 1c48275a28fa3bccdeb6bc12e4f0bcea6c05a81b
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Mon Feb 6 11:51:27 2017 +0000
    
        convert resources containing strings to stringarray resources
    
    cause the original defines weren't in numerical order and I missed
    that
    
    Change-Id: Ic81c9bad2432c3ffa49c56812924965017a05220

diff --git a/svx/source/dialog/swframeposstrings.src b/svx/source/dialog/swframeposstrings.src
index c36efbf0296a..e8c1c07b5af1 100644
--- a/svx/source/dialog/swframeposstrings.src
+++ b/svx/source/dialog/swframeposstrings.src
@@ -24,27 +24,38 @@ StringArray RID_SVXSW_FRAMEPOSITIONS
     ItemList [ en-US ] =
     {
         < "Left" ; > ;
-        < "Inside" ; > ;
         < "Right" ; > ;
-        < "Outside" ; > ;
-        < "Center" ; > ;
         < "From left" ; > ;
+        < "Inside" ; > ;
+        < "Outside" ; > ;
         < "From inside" ; > ;
         < "Paragraph area" ; > ;
         < "Paragraph text area" ; > ;
         < "Left page border" ; > ;
-        < "Inner page border" ; > ;
         < "Right page border" ; > ;
-        < "Outer page border" ; > ;
         < "Left paragraph border" ; > ;
-        < "Inner paragraph border" ; > ;
         < "Right paragraph border" ; > ;
+        < "Inner page border" ; > ;
+        < "Outer page border" ; > ;
+        < "Inner paragraph border" ; > ;
         < "Outer paragraph border" ; > ;
         < "Entire page" ; > ;
         < "Page text area" ; > ;
+        < "Base line" ; > ;
+        < "Character" ; > ;
+        < "Row" ; > ;
+        < "Margin" ; > ;
+        < "Paragraph text area" ; > ;
+        < "Left frame border" ; > ;
+        < "Right frame border" ; > ;
+        < "Entire frame" ; > ;
+        < "Frame text area" ; > ;
+        < "Inner frame border" ; > ;
+        < "Outer frame border" ; > ;
         < "Top" ; > ;
         < "Bottom" ; > ;
         < "Center" ; > ;
+        < "Center" ; > ;
         < "From top" ; > ;
         < "From bottom" ; > ;
         < "Below" ; > ;
@@ -53,17 +64,6 @@ StringArray RID_SVXSW_FRAMEPOSITIONS
         < "Bottom page border" ; > ;
         < "Top paragraph border" ; > ;
         < "Bottom paragraph border" ; > ;
-        < "Margin" ; > ;
-        < "Paragraph text area" ; > ;
-        < "Left frame border" ; > ;
-        < "Inner frame border" ; > ;
-        < "Right frame border" ; > ;
-        < "Outer frame border" ; > ;
-        < "Entire frame" ; > ;
-        < "Frame text area" ; > ;
-        < "Base line" ; > ;
-        < "Character" ; > ;
-        < "Row" ; > ;
         < "Line of text" ; > ;
     };
 };


More information about the Libreoffice-commits mailing list