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

[Matteo Casalin]

 sw/source/ui/inc/numprevw.hxx |    5 +++--
 sw/source/ui/inc/outline.hxx  |    7 ++++---
 sw/source/ui/misc/outline.cxx |    6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 80dfbe76a8b04017897a5d96e5aa6038d0699ebe
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Sat Aug 24 18:01:05 2013 +0200

    String to OUString
    
    Change-Id: I5e071f9484abae04efa2ba1526448182068d8f9c
    Reviewed-on: https://gerrit.libreoffice.org/5619
    Reviewed-by: Matteo Casalin <matteo.casalin at yahoo.com>
    Tested-by: Matteo Casalin <matteo.casalin at yahoo.com>

diff --git a/sw/source/ui/inc/numprevw.hxx b/sw/source/ui/inc/numprevw.hxx
index 605c995..9e0994e 100644
--- a/sw/source/ui/inc/numprevw.hxx
+++ b/sw/source/ui/inc/numprevw.hxx
@@ -24,13 +24,14 @@
 #include <vcl/window.hxx>
 
 class SwNumRule;
+namespace rtl { class OUString; }
 
 class NumberingPreview : public Window
 {
     const SwNumRule*    pActNum;
     Font                aStdFont;
     long                nPageWidth;
-    const String*       pOutlineNames;
+    const OUString*     pOutlineNames;
     sal_Bool                bPosition;
     sal_uInt16              nActLevel;
 
@@ -58,7 +59,7 @@ class NumberingPreview : public Window
                     {pActNum = pNum; Invalidate();};
         void    SetPageWidth(long nPgWidth)
                                 {nPageWidth = nPgWidth;}
-        void    SetOutlineNames(const String* pNames)
+        void    SetOutlineNames(const OUString* pNames)
                         {pOutlineNames = pNames;}
         void    SetPositionMode()
                         { bPosition = sal_True;}
diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx
index 0e2fa18..ca984ac 100644
--- a/sw/source/ui/inc/outline.hxx
+++ b/sw/source/ui/inc/outline.hxx
@@ -38,6 +38,7 @@
 #include "swtypes.hxx"      //for MAXLEVEL
 #include <numprevw.hxx>
 #include <numberingtypelistbox.hxx>
+#include "rtl/ustring.hxx"
 
 class SwWrtShell;
 class SwNumRule;
@@ -50,7 +51,7 @@ class SwOutlineTabDialog : public SfxTabDialog
     sal_uInt16 m_nNumPosId;
     sal_uInt16 m_nOutlineId;
 
-    String              aCollNames[MAXLEVEL];
+    OUString            aCollNames[MAXLEVEL];
 
     SwWrtShell&         rWrtSh;
     SwNumRule*          pNumRule;
@@ -74,7 +75,7 @@ class SwOutlineTabDialog : public SfxTabDialog
 
     SwNumRule*          GetNumRule() {return pNumRule;}
     sal_uInt16              GetLevel(const String &rFmtName) const;
-    String*             GetCollNames() {return aCollNames;}
+    OUString*           GetCollNames() {return aCollNames;}
 
     static sal_uInt16       GetActNumLevel() {return nNumLevel;}
     static void         SetActNumLevel(sal_uInt16 nSet) {nNumLevel = nSet;}
@@ -98,7 +99,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage
     String              aSaveCollNames[MAXLEVEL];
     SwWrtShell*         pSh;
     SwNumRule*          pNumRule;
-    String*             pCollNames;
+    OUString*           pCollNames;
     sal_uInt16              nActLevel;
 
     DECL_LINK( LevelHdl, ListBox * );
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 0e8c8ce..46ecbe6 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -390,7 +390,7 @@ short SwOutlineTabDialog::Ok()
                 pTxtColl->DeleteAssignmentToListLevelOfOutlineStyle();
                 pTxtColl->ResetFmtAttr(RES_PARATR_NUMRULE);
 
-                if( aCollNames[i].Len() )
+                if( !aCollNames[i].isEmpty() )
                 {
                     pTxtColl = rWrtSh.GetParaStyle(
                                 aCollNames[i], SwWrtShell::GETSTYLE_CREATESOME);
@@ -626,7 +626,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, ListBox *, pBox )
     if( sOldName.Len() )
         for( i = 0; i < MAXLEVEL; ++i)
             if( aSaveCollNames[ i ] == sOldName && i != nTmpLevel &&
-                !pCollNames[ i ].Len() )
+                pCollNames[ i ].isEmpty() )
             {
                 sal_uInt8 n;
                 for( n = 0; n < MAXLEVEL; ++n )
@@ -1131,7 +1131,7 @@ void    NumberingPreview::Paint( const Rectangle& /*rRect*/ )
                     Point(nXStart + nTextOffset, nYStart),
                     (pOutlineNames == 0
                      ? utl::ConfigManager::getProductName()
-                     : OUString(pOutlineNames[nLevel])));
+                     : pOutlineNames[nLevel]));
             }
         }
     }