From 5482dcbbc6b4f1e04b7dd31289b9e2f12679c1cf Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@oracle.com>
Date: Wed, 24 Nov 2010 09:35:49 +0100
Subject: dba34b: #i115760# expand vnd.sun.star.expand URLs before calling
 makeRelocatable/AbsoluteURL

---
 sfx2/source/inc/sfxurlrelocator.hxx | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'sfx2/source/inc/sfxurlrelocator.hxx')

diff --git a/sfx2/source/inc/sfxurlrelocator.hxx b/sfx2/source/inc/sfxurlrelocator.hxx
index 8acc674b3568..5ab1125b7cb6 100644
--- a/sfx2/source/inc/sfxurlrelocator.hxx
+++ b/sfx2/source/inc/sfxurlrelocator.hxx
@@ -30,6 +30,7 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/XOfficeInstallationDirectories.hpp>
+#include <com/sun/star/util/XMacroExpander.hpp>
 
 #include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
@@ -39,6 +40,7 @@ class SfxURLRelocator_Impl
     ::osl::Mutex maMutex;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >           mxFactory;
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XOfficeInstallationDirectories > mxOfficeInstDirs;
+    ::com::sun::star::uno::Reference< ::com::sun::star::util::XMacroExpander >                 mxMacroExpander;
 
 public:
     static bool                 propertyCanContainOfficeDir( const rtl::OUString & rPropName );
@@ -48,6 +50,9 @@ public:
 
     SfxURLRelocator_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory );
     ~SfxURLRelocator_Impl();
+
+private:
+    void implExpandURL( ::rtl::OUString& io_url );
 };
 
 #endif
-- 
cgit