Further clean-up

Change-Id: I20049b482c831e4ac2221fddfe80deb9847e72c3

2 files changed, 1 insertions, 26 deletions

diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index bcbd245dc0ec..c1c90d355bde 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/util/XMacroExpander.hpp>
 #include <com/sun/star/util/XStringSubstitution.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -231,7 +230,6 @@ class SfxLibraryContainer : public SfxLibraryContainer_BASE, public ::utl::OEven
 protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >       mxContext;
     ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >      mxSFI;
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XMacroExpander >         mxMacroExpander;
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringSubstitution >    mxStringSubstitution;
     ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel >            mxOwnerDocument;
 
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 09fc0e63ec06..d95596d7bfc5 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -31,7 +31,6 @@
 #include <osl/mutex.hxx>
 #include <tools/errinf.hxx>
 #include <rtl/ustring.hxx>
-#include <rtl/uri.hxx>
 #include <rtl/strbuf.hxx>
 #include <comphelper/getexpandeduri.hxx>
 #include <comphelper/processfactory.hxx>
@@ -60,7 +59,6 @@
 #include <com/sun/star/script/vba/VBAScriptEventId.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <com/sun/star/util/PathSubstitution.hpp>
-#include <com/sun/star/util/theMacroExpander.hpp>
 #include <com/sun/star/deployment/ExtensionManager.hpp>
 #include <comphelper/storagehelper.hxx>
 #include <cppuhelper/exc_hlp.hxx>
@@ -92,8 +90,6 @@ using namespace osl;
 
 using com::sun::star::uno::Reference;
 
-using ::rtl::Uri;
-
 // #i34411: Flag for error handling during migration
 static bool GbMigrationSuppressErrors = false;
 
@@ -1384,10 +1380,6 @@ throw(WrappedTargetException, RuntimeException)
     return true;
 }
 
-
-
-#define EXPAND_PROTOCOL "vnd.sun.star.expand"
-
 OUString SfxLibraryContainer::createAppLibraryFolder( SfxLibrary* pLib, const OUString& aName )
 {
     OUString aLibDirPath = pLib->maStorageURL;
@@ -2877,23 +2869,8 @@ void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OU
 OUString SfxLibraryContainer::expand_url( const OUString& url )
     throw(::com::sun::star::uno::RuntimeException)
 {
-    if (url.startsWith( EXPAND_PROTOCOL ":" ))
+    if (url.startsWithIgnoreAsciiCase( "vnd.sun.star.expand:" ))
     {
-        if( !mxMacroExpander.is() )
-        {
-            Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(mxContext);
-            MutexGuard guard( Mutex::getGlobalMutex() );
-            if( !mxMacroExpander.is() )
-            {
-                mxMacroExpander = xExpander;
-            }
-        }
-
-        if( !mxMacroExpander.is() )
-        {
-            return url;
-        }
-
         return comphelper::getExpandedUri(mxContext, url);
     }
     else if( mxStringSubstitution.is() )