diff options
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/basidesh.cxx | 4 | ||||
| -rw-r--r-- | basctl/source/basicide/bastypes.cxx | 4 | ||||
| -rw-r--r-- | basctl/source/inc/bastypes.hxx | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 65c92d6ce9fd..e99224ce7ff5 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -799,7 +799,7 @@ void BasicIDEShell::UpdateWindows() for ( sal_Int32 j = 0 ; j < nModCount ; j++ ) { - String aModName = pModNames[ j ]; + ::rtl::OUString aModName = pModNames[ j ]; ModulWindow* pWin = FindBasWin( *doc, aLibName, aModName, sal_False ); if ( !pWin ) pWin = CreateBasWin( *doc, aLibName, aModName ); @@ -828,7 +828,7 @@ void BasicIDEShell::UpdateWindows() for ( sal_Int32 j = 0 ; j < nDlgCount ; j++ ) { - String aDlgName = pDlgNames[ j ]; + ::rtl::OUString aDlgName = pDlgNames[ j ]; // this find only looks for non-suspended windows; // suspended windows are handled in CreateDlgWin DialogWindow* pWin = FindDlgWin( *doc, aLibName, aDlgName, sal_False ); diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index f7dc4e5f5160..2ced84170073 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -760,7 +760,7 @@ sal_uLong CalcLineCount( SvStream& rStream ) return nCRs; } -LibInfoKey::LibInfoKey( const ScriptDocument& rDocument, const String& rLibName ) +LibInfoKey::LibInfoKey( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName ) :m_aDocument( rDocument ) ,m_aLibName( rLibName ) { @@ -791,7 +791,7 @@ bool LibInfoKey::operator==( const LibInfoKey& rKey ) const return bRet; } -LibInfoItem::LibInfoItem( const ScriptDocument& rDocument, const String& rLibName, const String& rCurrentName, sal_uInt16 nCurrentType ) +LibInfoItem::LibInfoItem( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rCurrentName, sal_uInt16 nCurrentType ) :m_aDocument( rDocument ) ,m_aLibName( rLibName ) ,m_aCurrentName( rCurrentName ) diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index 8684fe5a3fbb..e8c89f00a093 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -262,10 +262,10 @@ class LibInfoKey { private: ScriptDocument m_aDocument; - String m_aLibName; + ::rtl::OUString m_aLibName; public: - LibInfoKey( const ScriptDocument& rDocument, const String& rLibName ); + LibInfoKey( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName ); ~LibInfoKey(); LibInfoKey( const LibInfoKey& rKey ); @@ -275,19 +275,19 @@ public: const ScriptDocument& GetDocument() const { return m_aDocument; } - const String& GetLibName() const { return m_aLibName; } + const ::rtl::OUString& GetLibName() const { return m_aLibName; } }; class LibInfoItem { private: ScriptDocument m_aDocument; - String m_aLibName; - String m_aCurrentName; + ::rtl::OUString m_aLibName; + ::rtl::OUString m_aCurrentName; sal_uInt16 m_nCurrentType; public: - LibInfoItem( const ScriptDocument& rDocument, const String& rLibName, const String& rCurrentName, sal_uInt16 nCurrentType ); + LibInfoItem( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rCurrentName, sal_uInt16 nCurrentType ); ~LibInfoItem(); LibInfoItem( const LibInfoItem& rItem ); @@ -295,8 +295,8 @@ public: const ScriptDocument& GetDocument() const { return m_aDocument; } - const String& GetLibName() const { return m_aLibName; } - const String& GetCurrentName() const { return m_aCurrentName; } + const ::rtl::OUString& GetLibName() const { return m_aLibName; } + const ::rtl::OUString& GetCurrentName() const { return m_aCurrentName; } sal_uInt16 GetCurrentType() const { return m_nCurrentType; } }; |