[Libreoffice-commits] core.git: 2 commits - bin/rename-sw-abbreviations.sh sw/source

[Jan Holesovsky]

 bin/rename-sw-abbreviations.sh                     |    6 +++---
 sw/source/uibase/config/StoredChapterNumbering.cxx |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 0d7a34d11f05dfdb010fce43710a3f03a931616c
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed May 13 11:27:23 2015 +0200

    rename-sw-abbreviations.sh: More stuff that must stay verbatim.

diff --git a/bin/rename-sw-abbreviations.sh b/bin/rename-sw-abbreviations.sh
index ccaab39..dc1bf93 100755
--- a/bin/rename-sw-abbreviations.sh
+++ b/bin/rename-sw-abbreviations.sh
@@ -16,8 +16,8 @@ for I in "FrmFmt/FrameFormat" "Fmt/Format" "Cntnt/Content" "Txt/Text" "Tbl/Table
 do
     S="${I%/*}"
     # change all except the filenames (in the .mk and in #include)
-    # also avoid XML_numFmt, that's a token name
-    git grep -l "$S" sw/ | grep -v -e '\.mk' -e '/data/' | xargs sed -i '/\(#include\|XML_numFmt\)/ !{ s/'"$I"'/g }'
+    # also avoid numFmt (OOXML token) and other stuff that must stay verbatim
+    git grep -l "$S" sw/ | grep -v -e '\.mk' -e '/data/' | xargs sed -i '/\(#include\|numFmt\|ForeignTxt\)/ !{ s/'"$I"'/g }'
 done
 
 # global:
@@ -40,4 +40,4 @@ do
     git grep -l "$S" | grep -v -e '\.mk' -e 'rename-sw-abbreviations.sh' | xargs sed -i "s/$I/g"
 done
 
-# vim: set noet sw=4 ts=4:
+# vim: set et sw=4 ts=4 textwidth=0:
commit c6b00f6b277e5751f6fe5e3366e33ac19fcbf729
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed May 13 11:26:31 2015 +0200

    sw: Rename variable.

diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx
index 1621841..df5388c 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -154,15 +154,15 @@ public:
                     static_cast< ::cppu::OWeakObject*>(this), 1);
 
         SolarMutexGuard g;
-        SwNumFmt numFmt;
+        SwNumFmt aNumberFormat;
         OUString charStyleName;
         SwXNumberingRules::SetPropertiesToNumFmt(
-            numFmt,
+            aNumberFormat,
             charStyleName,
             0, 0, 0, 0, 0,
             props);
         SwNumRulesWithName *const pRules(GetOrCreateRules());
-        pRules->SetNumFmt(nIndex, numFmt, charStyleName);
+        pRules->SetNumFmt(nIndex, aNumberFormat, charStyleName);
     }
 };