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

[Matteo Casalin]

 sw/source/core/crsr/callnk.cxx           |    2 +-
 sw/source/core/crsr/crossrefbookmark.cxx |   12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 2d275be83f905f88c8c4ec982165af9102e3a920
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Wed Jul 31 08:00:39 2013 +0200

    Reduce scope of global constants
    
    Change-Id: I938c56d5d1200ada439df2a25b0d46eddf9c3a7f

diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 1cc7aea..32442ff 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -21,6 +21,14 @@
 #include <crossrefbookmark.hxx>
 #include <ndtxt.hxx>
 
+namespace
+{
+
+const char CrossRefHeadingBookmark_NamePrefix[] = "__RefHeading__";
+const char CrossRefNumItemBookmark_NamePrefix[] = "__RefNumPara__";
+
+}
+
 namespace sw { namespace mark
 {
     CrossRefBookmark::CrossRefBookmark(const SwPaM& rPaM,
@@ -60,8 +68,6 @@ namespace sw { namespace mark
         return *static_cast<SwPosition*>(NULL);
     }
 
-    const char CrossRefHeadingBookmark_NamePrefix[] = "__RefHeading__";
-
     CrossRefHeadingBookmark::CrossRefHeadingBookmark(const SwPaM& rPaM,
         const KeyCode& rCode,
         const OUString& rName,
@@ -74,8 +80,6 @@ namespace sw { namespace mark
         return rName.match(CrossRefHeadingBookmark_NamePrefix);
     }
 
-    const char CrossRefNumItemBookmark_NamePrefix[] = "__RefNumPara__";
-
     CrossRefNumItemBookmark::CrossRefNumItemBookmark(const SwPaM& rPaM,
         const KeyCode& rCode,
         const OUString& rName,
commit 0e5634e73036767887fb64bf3de7eb0908e98a09
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Wed Jul 31 07:59:39 2013 +0200

    String to OUString
    
    Change-Id: I3290969a556d5eb824cbe6bd06984e0ac0cdbf35

diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index bc18dd1..2ee6108 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -203,7 +203,7 @@ SwCallLink::~SwCallLink()
 
             if( g_pBreakIt->GetBreakIter().is() )
             {
-                const String& rTxt = ((SwTxtNode*)pCNd)->GetTxt();
+                const OUString rTxt = ((SwTxtNode*)pCNd)->GetTxt();
                 if( !nCmp ||
                     g_pBreakIt->GetBreakIter()->getScriptType( rTxt, nCmp )
                      != g_pBreakIt->GetBreakIter()->getScriptType( rTxt, nCmp - 1 ))