diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-08 16:12:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-09 08:28:56 +0200 |
| commit | 719a2adfbdac8ce26a035e5fedeeaade8706832d (patch) | |
| tree | 541a185d2c60d83da75306bab6bd93527c9b4d73 /basic | |
| parent | 4763091bbecab8722a43d0ed73eafc0a1f596242 (diff) | |
remove unnecessary empty OUString fields and vars
Change-Id: I940120087a0bc6b1b0abc30a3e7727ce22b7d9a7
Reviewed-on: https://gerrit.libreoffice.org/37394
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/basmgr/basmgr.cxx | 3 | ||||
| -rw-r--r-- | basic/source/comp/symtbl.cxx | 4 | ||||
| -rw-r--r-- | basic/source/inc/symtbl.hxx | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 0258b268fedb..4acd754113ff 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -555,9 +555,8 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo ) if( xScriptCont.is() ) { // Register listener for lib container - OUString aEmptyLibName; uno::Reference< container::XContainerListener > xLibContainerListener - = new BasMgrContainerListenerImpl( this, aEmptyLibName ); + = new BasMgrContainerListenerImpl( this, "" ); uno::Reference< container::XContainer> xLibContainer( xScriptCont, uno::UNO_QUERY ); xLibContainer->addContainerListener( xLibContainerListener ); diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx index b7017572e86f..81824a426e68 100644 --- a/basic/source/comp/symtbl.cxx +++ b/basic/source/comp/symtbl.cxx @@ -46,10 +46,10 @@ SbiStringPool::SbiStringPool( ) SbiStringPool::~SbiStringPool() {} -const OUString& SbiStringPool::Find( sal_uInt32 n ) const +OUString SbiStringPool::Find( sal_uInt32 n ) const { if( n == 0 || n > aData.size() ) - return aEmpty; //hack, returning a reference to a simulation of null + return OUString(); else return aData[n - 1]; } diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx index f1ba8d0028f3..5ff54d2f87af 100644 --- a/basic/source/inc/symtbl.hxx +++ b/basic/source/inc/symtbl.hxx @@ -35,7 +35,6 @@ enum SbiSymScope { SbLOCAL, SbPARAM, SbPUBLIC, SbGLOBAL, SbRTL }; // makes sure that they don't exist twice. class SbiStringPool { - const OUString aEmpty; std::vector<OUString> aData; public: SbiStringPool(); @@ -43,7 +42,7 @@ public: sal_uInt32 GetSize() const { return aData.size(); } short Add( const OUString& ); short Add( double, SbxDataType ); - const OUString& Find( sal_uInt32 ) const; + OUString Find( sal_uInt32 ) const; }; |