diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-03 20:29:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-03 20:30:18 +0100 |
| commit | 179810cdf254177197a3108e970d9555468cd265 (patch) | |
| tree | 2250c1dc9ed3c637a682e6a30c6cafac945fd133 /cui | |
| parent | Code clean-up/consolidation task. (diff) | |
| download | core-179810cdf254177197a3108e970d9555468cd265.tar.gz core-179810cdf254177197a3108e970d9555468cd265.zip | |
Further clean-up
Change-Id: I20049b482c831e4ac2221fddfe80deb9847e72c3
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/treeopt.cxx | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index dc0c16915a7e..05bb302140d1 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -65,7 +65,6 @@ #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/loader/CannotActivateFactoryException.hpp> #include <com/sun/star/linguistic2/LinguProperties.hpp> -#include <com/sun/star/util/theMacroExpander.hpp> #include <com/sun/star/setup/UpdateCheck.hpp> #include <comphelper/getexpandeduri.hxx> #include <comphelper/processfactory.hxx> @@ -77,7 +76,6 @@ #include <osl/module.hxx> #include <osl/process.h> #include <rtl/bootstrap.hxx> -#include <rtl/uri.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/module.hxx> @@ -120,8 +118,6 @@ using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -#define EXPAND_PROTOCOL "vnd.sun.star.expand:" - LastPageSaver* OfaTreeOptionsDialog::pLastPageSaver = NULL; // some stuff for easier changes for SvtViewOptions @@ -823,7 +819,6 @@ void OfaTreeOptionsDialog::ActivateLastSelection() SvTreeListEntry* pEntry = NULL; if ( pLastPageSaver ) { - OUString sExpand( EXPAND_PROTOCOL ); OUString sLastURL = bIsFromExtensionManager ? pLastPageSaver->m_sLastPageURL_ExtMgr : pLastPageSaver->m_sLastPageURL_Tools; if ( sLastURL.isEmpty() ) @@ -832,17 +827,8 @@ void OfaTreeOptionsDialog::ActivateLastSelection() : pLastPageSaver->m_sLastPageURL_Tools; } - // MacroExpander to convert "expand"-URL to "file"-URL - Reference< XMacroExpander > xMacroExpander; bool bMustExpand = ( INetURLObject( sLastURL ).GetProtocol() == INET_PROT_FILE ); - if ( bMustExpand ) - { - Reference< XComponentContext > xContext( - comphelper::getProcessComponentContext() ); - xMacroExpander = theMacroExpander::get(xContext); - } - SvTreeListEntry* pTemp = pTreeLB->First(); while( !pEntry && pTemp ) { @@ -851,9 +837,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection() { OptionsPageInfo* pPageInfo = (OptionsPageInfo*)pTemp->GetUserData(); OUString sPageURL = pPageInfo->m_sPageURL; - if ( bMustExpand - && !sPageURL.isEmpty() - && sPageURL.startsWith( sExpand ) ) + if ( bMustExpand ) { sPageURL = comphelper::getExpandedUri( comphelper::getProcessComponentContext(), sPageURL); |