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

[Chr. Rossmanith]

 sw/source/filter/ww1/w1class.cxx  |    4 ++--
 sw/source/filter/ww1/w1class.hxx  |    2 +-
 sw/source/ui/dialog/swabstdlg.cxx |    3 +--
 sw/source/ui/dialog/swdialmgr.cxx |    4 ----
 4 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 646ce81d1c1623feb5414cd248860b143fd2cd6b
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date:   Sat Oct 12 21:35:25 2013 +0200

    fdo#38838 use OUString instead of String
    
    Change-Id: I0c94a9ee10bd66422abd9526fcc9a9ce61d9a096
    Reviewed-on: https://gerrit.libreoffice.org/6237
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index 7a6552e..72de563 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -154,11 +154,11 @@ sal_uInt16 Ww1Style::ReadName( sal_uInt8*&p, sal_uInt16& rnCountBytes, sal_uInt1
             pStr = "?";
         else
             pStr = names[nSize-222];
-        SetName(String(pStr, RTL_TEXTENCODING_MS_1252));
+        SetName(OUString(pStr, strlen(pStr), RTL_TEXTENCODING_MS_1252));
     }
     else if( 255 > nCountBytes ) // unused
     {
-        SetName( String( (sal_Char*)p, nCountBytes, RTL_TEXTENCODING_MS_1252 ));
+        SetName( OUString( (sal_Char*)p, nCountBytes, RTL_TEXTENCODING_MS_1252 ));
         p += nCountBytes;
         OSL_ENSURE(rnCountBytes>=nCountBytes, "Ww1Style");
         rnCountBytes = rnCountBytes - nCountBytes;
diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx
index c0824e2..2e01242 100644
--- a/sw/source/filter/ww1/w1class.hxx
+++ b/sw/source/filter/ww1/w1class.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 // local
 #include <w1struct.hxx>
diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/ui/dialog/swabstdlg.cxx
index 5a28bc3..64da0e3 100644
--- a/sw/source/ui/dialog/swabstdlg.cxx
+++ b/sw/source/ui/dialog/swabstdlg.cxx
@@ -21,7 +21,6 @@
 #include "swabstdlg.hxx"
 
 #include <osl/module.hxx>
-#include <tools/string.hxx>
 #include <vcl/unohelp.hxx>
 
 typedef SwAbstractDialogFactory* (SAL_CALL *SwFuncPtrCreateDialogFactory)();
@@ -42,7 +41,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
     SwFuncPtrCreateDialogFactory fp = 0;
     static ::osl::Module aDialogLibrary;
     static const OUString sLibName(::vcl::unohelper::CreateLibraryName("swui", sal_True));
-    if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( sLibName ),
+    if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName,
                                                              SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
         fp = ( SwAbstractDialogFactory* (SAL_CALL*)() )
             aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory"));
diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx
index fe14678..fb6ed35 100644
--- a/sw/source/ui/dialog/swdialmgr.cxx
+++ b/sw/source/ui/dialog/swdialmgr.cxx
@@ -18,13 +18,9 @@
  */
 
 #include "dialmgr.hxx"
-#include "tools/string.hxx"
 #include <sfx2/app.hxx>
 
 #ifndef DISABLE_DYNLOADING
-//copy from core\bastyp\swtypes.cxx
-String aEmptyStr; // constant strings
-
 ResMgr* pSwResMgr=0;
 #else
 static ResMgr *pSwResMgr;