[PATCH] String cleanup in filter

[Ricardo Montania (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1848

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/1848/1

String cleanup in filter

Change-Id: I5678cd4f0bbfc1603bb7f3881adb4359a25ddbc5
---
M filter/inc/filter/msfilter/svxmsbas.hxx
M filter/source/msfilter/svxmsbas2.cxx
2 files changed, 8 insertions(+), 8 deletions(-)



diff --git a/filter/inc/filter/msfilter/svxmsbas.hxx b/filter/inc/filter/msfilter/svxmsbas.hxx
index 66df15e..8f87401 100644
--- a/filter/inc/filter/msfilter/svxmsbas.hxx
+++ b/filter/inc/filter/msfilter/svxmsbas.hxx
@@ -44,9 +44,9 @@
  * probably what the user expects to see when viewing the code
  */
 
-typedef boost::unordered_map< sal_Int32, String >  ObjIdToName;
+typedef boost::unordered_map< sal_Int32, OUString >  ObjIdToName;
 
-typedef std::map< String, ObjIdToName >  ControlAttributeInfo;
+typedef std::map< OUString, ObjIdToName >  ControlAttributeInfo;
 
 class MSFILTER_DLLPUBLIC SvxImportMSVBasic
 {
@@ -58,13 +58,13 @@
     // form the ObjectShell
     // - returns a warning code if a modified basic exist, in all other
     //   cases return ERRCODE_NONE.
-    sal_uLong SaveOrDelMSVBAStorage( sal_Bool bSaveInto, const String& rStorageName );
+    sal_uLong SaveOrDelMSVBAStorage( sal_Bool bSaveInto, const OUString& rStorageName );
 
     // check if the MS-VBA-Storage exist in the RootStorage of the DocShell.
     // If it exist, then return the WarningId for loosing the information.
     static sal_uLong GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS );
 
-    static String GetMSBasicStorageName();
+    static OUString GetMSBasicStorageName();
 private:
     SotStorageRef xRoot;
     SfxObjectShell &rDocSh;
diff --git a/filter/source/msfilter/svxmsbas2.cxx b/filter/source/msfilter/svxmsbas2.cxx
index d0b9d91..a1c4b8e 100644
--- a/filter/source/msfilter/svxmsbas2.cxx
+++ b/filter/source/msfilter/svxmsbas2.cxx
@@ -26,11 +26,11 @@
 using namespace com::sun::star;
 
 sal_uLong SvxImportMSVBasic::SaveOrDelMSVBAStorage( sal_Bool bSaveInto,
-                                                const String& rStorageName )
+                                                const OUString& rStorageName )
 {
     sal_uLong nRet = ERRCODE_NONE;
     uno::Reference < embed::XStorage > xSrcRoot( rDocSh.GetStorage() );
-    String aDstStgName( GetMSBasicStorageName() );
+    OUString aDstStgName( GetMSBasicStorageName() );
     SotStorageRef xVBAStg( SotStorage::OpenOLEStorage( xSrcRoot, aDstStgName,
                                 STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYALL ) );
     if( xVBAStg.Is() && !xVBAStg->GetError() )
@@ -70,9 +70,9 @@
                     : ERRCODE_NONE;
 }
 
-String SvxImportMSVBasic::GetMSBasicStorageName()
+OUString SvxImportMSVBasic::GetMSBasicStorageName()
 {
-    return String( RTL_CONSTASCII_USTRINGPARAM( "_MS_VBA_Macros" ) );
+    return OUString( "_MS_VBA_Macros" );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

-- 
To view, visit https://gerrit.libreoffice.org/1848
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5678cd4f0bbfc1603bb7f3881adb4359a25ddbc5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania <ricardo at linuxafundo.com.br>