summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
Diffstat (limited to 'basic')
-rw-r--r--basic/source/basmgr/basmgr.cxx3
-rw-r--r--basic/source/comp/symtbl.cxx4
-rw-r--r--basic/source/inc/symtbl.hxx3
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;
};