diff options
| author | Ricardo Montania <ricardo@linuxafundo.com.br> | 2013-01-24 17:03:19 -0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-01-25 00:36:40 +0000 |
| commit | 0d6e43bd788c075675b549ff4f63f706406cefa5 (patch) | |
| tree | f93cd3425c1f03c0f71e48ecf737c210278ce693 /filter | |
| parent | 5d743ce2d1f548fafd34e31ada411df7f7e2fea1 (diff) | |
String cleanup in filter
Change-Id: I5678cd4f0bbfc1603bb7f3881adb4359a25ddbc5
Reviewed-on: https://gerrit.libreoffice.org/1848
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/inc/filter/msfilter/svxmsbas.hxx | 8 | ||||
| -rw-r--r-- | filter/source/msfilter/svxmsbas2.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/filter/inc/filter/msfilter/svxmsbas.hxx b/filter/inc/filter/msfilter/svxmsbas.hxx index 66df15e03af0..8f87401edee5 100644 --- a/filter/inc/filter/msfilter/svxmsbas.hxx +++ b/filter/inc/filter/msfilter/svxmsbas.hxx @@ -44,9 +44,9 @@ class SfxObjectShell; * 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 @@ public: // 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 d0b9d9159dc0..a1c4b8eb8825 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 @@ sal_uLong SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS : 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: */ |