reduce UniStrings

6 files changed, 9 insertions, 11 deletions

diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index a4e0e15a9eca..08211a269831 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -28,11 +28,11 @@
 #ifndef _MDIEXP_HXX
 #define _MDIEXP_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
 #include <tblenum.hxx>
 #include <swdllapi.h>
 
-class UniString;
 class SwRect;
 class Size;
 class Dialog;
@@ -48,7 +48,7 @@ extern void SizeNotify(ViewShell* pVwSh, const Size &);
 extern void PageNumNotify( ViewShell* pVwSh,
                             sal_uInt16 nPhyNum,
                             sal_uInt16 nVirtNum,
-                           const UniString& rPg );
+                           const rtl::OUString& rPg );
 
 enum FlyMode { FLY_DRAG_START, FLY_DRAG, FLY_DRAG_END };
 extern void FrameNotify( ViewShell* pVwSh, FlyMode eMode = FLY_DRAG );
@@ -72,7 +72,7 @@ void DelAllGrfCacheEntries( SwDoc* pDoc );
 // Read ChgMode for tables from configuration.
 TblChgMode GetTblChgDefaultMode();
 
-sal_Bool JumpToSwMark( ViewShell* pVwSh, const UniString& rMark );
+sal_Bool JumpToSwMark( ViewShell* pVwSh, const rtl::OUString& rMark );
 
 
 #endif
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 2b1ee116b6fb..7e466b40a8e6 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -171,7 +171,7 @@ enum RndStdIds
 
 extern ResMgr* pSwResMgr;           // Is in swapp0.cxx.
 #define SW_RES(i)       ResId(i,*pSwResMgr)
-#define SW_RESSTR(i)    UniString(ResId(i,*pSwResMgr))
+#define SW_RESSTR(i)    ResId::toString(SW_RES(i))
 
 ::com::sun::star::uno::Reference<
     ::com::sun::star::linguistic2::XSpellChecker1 > GetSpellChecker();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index db0fdb55a0e9..d1c65420735c 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2628,7 +2628,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, long nEnd, long nCpOfs)
     const CharSet eSrcCJKCharSet = bVer67 ? GetCurrentCJKCharSet() :
         RTL_TEXTENCODING_MS_1252;
 
-    // allocate UniString data
+    // allocate unicode string data
     rtl_uString *pStr = comphelper::string::rtl_uString_alloc(nStrLen);
     sal_Unicode* pBuffer = pStr->buffer;
     sal_Unicode* pWork = pBuffer;
diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx
index 3d053e8738e3..834851cfdccb 100644
--- a/sw/source/ui/docvw/edtwin3.cxx
+++ b/sw/source/ui/docvw/edtwin3.cxx
@@ -98,10 +98,8 @@ void SizeNotify(ViewShell* pVwSh, const Size &rSize)
     Description:    Notify for page number update
  --------------------------------------------------------------------*/
 
-
-
 void PageNumNotify( ViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum,
-                                                    const String& rPgStr)
+                                                    const rtl::OUString& rPgStr)
 {
     SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
     if ( pSfxVwSh && pSfxVwSh->ISA(SwView) &&
@@ -161,7 +159,7 @@ void RepaintPagePreview( ViewShell* pVwSh, const SwRect& rRect )
         ((SwPagePreView *)pSfxVwSh)->RepaintCoreRect( rRect );
 }
 
-sal_Bool JumpToSwMark( ViewShell* pVwSh, const String& rMark )
+sal_Bool JumpToSwMark( ViewShell* pVwSh, const rtl::OUString& rMark )
 {
     SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
     if( pSfxVwSh && pSfxVwSh->ISA( SwView ) )
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index b73c8dbb9810..222fddfff16a 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1167,7 +1167,7 @@ sal_Bool SwFldVarPage::FillItemSet(SfxItemSet& )
         {
             nSubType = (nFormat == ULONG_MAX) ? nsSwGetSetExpType::GSE_STRING : nsSwGetSetExpType::GSE_EXPR;
 
-            if (nFormat == ULONG_MAX && aNumFormatLB.GetSelectEntry() == SW_RESSTR(FMT_USERVAR_CMD))
+            if (nFormat == ULONG_MAX && aNumFormatLB.GetSelectEntry().Equals(SW_RESSTR(FMT_USERVAR_CMD)))
                 nSubType |= nsSwExtendedSubType::SUB_CMD;
 
             if (aInvisibleCB.IsChecked())
diff --git a/sw/source/ui/inc/dialmgr.hxx b/sw/source/ui/inc/dialmgr.hxx
index 8012a874212d..f4533a51ddc6 100644
--- a/sw/source/ui/inc/dialmgr.hxx
+++ b/sw/source/ui/inc/dialmgr.hxx
@@ -43,7 +43,7 @@ struct SwDialogsResMgr
 
 #define SWDIALOG_MGR()  SwDialogsResMgr::GetResMgr()
 #define SW_RES(i)       ResId(i,SWDIALOG_MGR())
-#define SW_RESSTR(i)    UniString(ResId(i,SWDIALOG_MGR()))
+#define SW_RESSTR(i)    ResId::toString(SW_RES(i))
 
 #endif