diff options
| -rw-r--r-- | basctl/source/basicide/basides1.cxx | 2 | ||||
| -rw-r--r-- | include/sfx2/minfitem.hxx | 34 | ||||
| -rw-r--r-- | sfx2/source/control/minfitem.cxx | 16 |
3 files changed, 26 insertions, 26 deletions
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 578940f2ce96..56b6f8d1bb0f 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -306,7 +306,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) SbModule* pModule = pBasic->FindModule( rInfo.GetModule() ); if ( !pModule ) { - if ( rInfo.GetModule().Len() || !pBasic->GetModules()->Count() ) + if ( !rInfo.GetModule().isEmpty() || !pBasic->GetModules()->Count() ) { OUString aModName = rInfo.GetModule(); diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx index fb06ffc1e979..f08bb68824e2 100644 --- a/include/sfx2/minfitem.hxx +++ b/include/sfx2/minfitem.hxx @@ -28,43 +28,43 @@ class BasicManager; class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem { const BasicManager* pBasicManager; - String aLibName; - String aModuleName; - String aMethodName; - String aCommentText; + OUString aLibName; + OUString aModuleName; + OUString aMethodName; + OUString aCommentText; public: TYPEINFO(); SfxMacroInfoItem( sal_uInt16 nWhich, const BasicManager* pMgr, - const String &rLibName, - const String &rModuleName, - const String &rMethodName, - const String &rComment); + const OUString &rLibName, + const OUString &rModuleName, + const OUString &rMethodName, + const OUString &rComment); SfxMacroInfoItem( const SfxMacroInfoItem& ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; - String GetComment() const + OUString GetComment() const { return aCommentText; } - void SetComment( const String& r ) + void SetComment( const OUString& r ) { aCommentText = r; } - String GetMethod() const + OUString GetMethod() const { return aMethodName; } - void SetMethod( const String& r ) + void SetMethod( const OUString& r ) { aMethodName = r; } - String GetModule() const + OUString GetModule() const { return aModuleName; } - void SetModule( const String& r ) + void SetModule( const OUString& r ) { aModuleName = r; } - String GetLib() const + OUString GetLib() const { return aLibName; } - void SetLib( const String& r ) + void SetLib( const OUString& r ) { aLibName = r; } const BasicManager* GetBasicManager() const { return pBasicManager; } - String GetQualifiedName() const; + OUString GetQualifiedName() const; }; #endif diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx index 105752d7313a..ba34c99959c6 100644 --- a/sfx2/source/control/minfitem.cxx +++ b/sfx2/source/control/minfitem.cxx @@ -28,10 +28,10 @@ TYPEINIT1(SfxMacroInfoItem, SfxPoolItem); SfxMacroInfoItem::SfxMacroInfoItem( sal_uInt16 nWhichId, // Slot-ID const BasicManager* pMgr, - const String &rLibName, - const String &rModuleName, - const String &rMethodName, - const String &rComment) : + const OUString &rLibName, + const OUString &rModuleName, + const OUString &rMethodName, + const OUString &rComment) : SfxPoolItem(nWhichId), pBasicManager(pMgr), aLibName(rLibName), @@ -78,12 +78,12 @@ SfxPoolItem *SfxMacroInfoItem::Clone( SfxItemPool *) const // ----------------------------------------------------------------------- -String SfxMacroInfoItem::GetQualifiedName() const +OUString SfxMacroInfoItem::GetQualifiedName() const { - String aMacroName = aLibName; - aMacroName += '.'; + OUString aMacroName = aLibName; + aMacroName += "."; aMacroName += aModuleName; - aMacroName += '.'; + aMacroName += "."; aMacroName += aMethodName; return aMacroName; } |