diff options
author | Noel Grandin <noel@peralex.com> | 2013-08-27 17:18:32 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-08-29 09:30:12 +0200 |
commit | eeac8047f18b404b8201a7e3a3b30b4e9e273b25 (patch) | |
tree | 37cbd9a54493d8d688a7351cfe40591886c8c8cb | |
parent | 3b130eba9e0666da29ef4efcc48f39a4c3ac3e41 (diff) |
convert include/sfx2/app.hxx from String to OUString
Change-Id: I7f1c3070fe3b0bb28b45c53d57c4cd1ba10c85d7
-rw-r--r-- | include/sfx2/app.hxx | 18 | ||||
-rw-r--r-- | sfx2/source/appl/app.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/appl/appcfg.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/appl/appopen.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/inc/appdata.hxx | 2 |
5 files changed, 19 insertions, 19 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index e2b90959af88..f8361f249e0b 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -113,7 +113,7 @@ public: //TODO/CLEANUP //is apparently used only in SfxPickList/SfxFrameLoader -DECL_OBJHINT( SfxStringHint, String ); +DECL_OBJHINT( SfxStringHint, OUString ); #ifndef SFX_DECL_OBJECTSHELL_DEFINED #define SFX_DECL_OBJECTSHELL_DEFINED @@ -165,7 +165,7 @@ public: /** * @param pArgs Takes ownership */ - sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc, const String& rFileName, sal_Bool bCopy=sal_True, SfxItemSet* pArgs = 0 ); + sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc, const OUString& rFileName, sal_Bool bCopy=sal_True, SfxItemSet* pArgs = 0 ); SfxTemplateDialog* GetTemplateDialog(); Window* GetTopWindow() const; @@ -175,16 +175,16 @@ public: // members SfxFilterMatcher& GetFilterMatcher(); SfxProgress* GetProgress() const; - const String& GetLastSaveDirectory() const; + const OUString& GetLastSaveDirectory() const; sal_uInt16 GetFreeIndex(); void ReleaseIndex(sal_uInt16 i); // Basic/Scripting - static sal_Bool IsXScriptURL( const String& rScriptURL ); + static sal_Bool IsXScriptURL( const OUString& rScriptURL ); static OUString ChooseScript(); static void MacroOrganizer( sal_Int16 nTabId ); - static ErrCode CallBasic( const String&, BasicManager*, SbxArray *pArgs, SbxValue *pRet ); - static ErrCode CallAppBasic( const String& i_macroName, SbxArray* i_args = NULL, SbxValue* i_ret = NULL ) + static ErrCode CallBasic( const OUString&, BasicManager*, SbxArray *pArgs, SbxValue *pRet ); + static ErrCode CallAppBasic( const OUString& i_macroName, SbxArray* i_args = NULL, SbxValue* i_ret = NULL ) { return CallBasic( i_macroName, SfxApplication::GetOrCreate()->GetBasicManager(), i_args, i_ret ); } BasicManager* GetBasicManager(); com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer > @@ -200,7 +200,7 @@ public: virtual void Invalidate(sal_uInt16 nId = 0); void NotifyEvent(const SfxEventHint& rEvent, bool bSynchron = true ); sal_Bool IsDowning() const; - sal_Bool IsSecureURL( const INetURLObject &rURL, const String *pReferer ) const; + sal_Bool IsSecureURL( const INetURLObject &rURL, const OUString *pReferer ) const; void ResetLastDir(); SAL_DLLPRIVATE static SfxApplication* Get() { return pApp;} @@ -243,8 +243,8 @@ public: SAL_DLLPRIVATE void OfaState_Impl(SfxItemSet &); SAL_DLLPRIVATE void SetProgress_Impl(SfxProgress *); - SAL_DLLPRIVATE const String& GetLastDir_Impl() const; - SAL_DLLPRIVATE void SetLastDir_Impl( const String & ); + SAL_DLLPRIVATE const OUString& GetLastDir_Impl() const; + SAL_DLLPRIVATE void SetLastDir_Impl( const OUString & ); SAL_DLLPRIVATE void Registrations_Impl(); SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame *pFrame=0) const; diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 0d14efa9b220..3fd793cb9058 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -248,7 +248,7 @@ SfxApplication::~SfxApplication() //==================================================================== -const String& SfxApplication::GetLastDir_Impl() const +const OUString& SfxApplication::GetLastDir_Impl() const /* [Description] @@ -266,7 +266,7 @@ const String& SfxApplication::GetLastDir_Impl() const return pAppData_Impl->aLastDir; } -const String& SfxApplication::GetLastSaveDirectory() const +const OUString& SfxApplication::GetLastSaveDirectory() const /* [Description] @@ -284,7 +284,7 @@ const String& SfxApplication::GetLastSaveDirectory() const void SfxApplication::SetLastDir_Impl ( - const String& rNewDir /* Complete directory path as a string */ + const OUString& rNewDir /* Complete directory path as a string */ ) /* [Description] @@ -526,7 +526,7 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) #endif } -sal_Bool SfxApplication::IsXScriptURL( const String& rScriptURL ) +sal_Bool SfxApplication::IsXScriptURL( const OUString& rScriptURL ) { sal_Bool result = sal_False; @@ -626,7 +626,7 @@ void SfxApplication::MacroOrganizer( sal_Int16 nTabId ) #endif } -ErrCode SfxApplication::CallBasic( const String& rCode, BasicManager* pMgr, SbxArray* pArgs, SbxValue* pRet ) +ErrCode SfxApplication::CallBasic( const OUString& rCode, BasicManager* pMgr, SbxArray* pArgs, SbxValue* pRet ) { #ifdef DISABLE_SCRIPTING (void) rCode; diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 6f8533d02041..f53278c9e015 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -495,7 +495,7 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet ) } //-------------------------------------------------------------------- -sal_Bool SfxApplication::IsSecureURL( const INetURLObject& rURL, const String* pReferer ) const +sal_Bool SfxApplication::IsSecureURL( const INetURLObject& rURL, const OUString* pReferer ) const { return SvtSecurityOptions().IsSecureURL( rURL.GetMainURL( INetURLObject::NO_DECODE ), *pReferer ); } @@ -903,6 +903,6 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron new SfxEventAsyncer_Impl( rEventHint ); } -IMPL_OBJHINT( SfxStringHint, String ) +IMPL_OBJHINT( SfxStringHint, OUString ) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index c4c0d779c087..1090856b4547 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -316,7 +316,7 @@ sal_uInt32 CheckPasswd_Impl //-------------------------------------------------------------------- -sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFileName, sal_Bool bCopy, SfxItemSet* pSet ) +sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUString &rFileName, sal_Bool bCopy, SfxItemSet* pSet ) { const SfxFilter* pFilter = NULL; SfxMedium aMedium( rFileName, ( STREAM_READ | STREAM_SHARE_DENYNONE ) ); @@ -799,7 +799,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) SFX_REQUEST_ARG( rReq, pFileName, SfxStringItem, SID_FILE_NAME, sal_False ); String aFileName = pFileName->GetValue(); - String aReferer; + OUString aReferer; SFX_REQUEST_ARG( rReq, pRefererItem, SfxStringItem, SID_REFERER, sal_False ); if ( pRefererItem ) aReferer = pRefererItem->GetValue(); diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx index 3e92ccd847c9..b9b4113b445a 100644 --- a/sfx2/source/inc/appdata.hxx +++ b/sfx2/source/inc/appdata.hxx @@ -70,7 +70,7 @@ class SfxAppData_Impl { public: IndexBitSet aIndexBitSet; // for counting noname documents - String aLastDir; // for IO dialog + OUString aLastDir; // for IO dialog // DDE stuff DdeService* pDdeService; |