diff options
| -rw-r--r-- | cui/source/options/treeopt.cxx | 7 | ||||
| -rwxr-xr-x | unusedcode.easy | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 2e4fad190344..9100312ce566 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1926,13 +1926,18 @@ bool isNodeActive( OptionsNode* pNode, Module* pModule ) void OfaTreeOptionsDialog::LoadExtensionOptions( const rtl::OUString& rExtensionId ) { Module* pModule = NULL; - Reference< XMultiServiceFactory > xMSFac = comphelper::getProcessServiceFactory(); + // when called by Tools - Options then load nodes of active module if ( rExtensionId.isEmpty() ) + { + Reference< XMultiServiceFactory > xMSFac = comphelper::getProcessServiceFactory(); pModule = LoadModule( GetModuleIdentifier( xMSFac, Reference< XFrame >() ) ); + } VectorOfNodes aNodeList = LoadNodes( pModule, rExtensionId ); InsertNodes( aNodeList ); + + delete pModule; } rtl::OUString OfaTreeOptionsDialog::GetModuleIdentifier( diff --git a/unusedcode.easy b/unusedcode.easy index fad89f697cba..0dd7c1145cba 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -163,7 +163,6 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::ViewShellBase::RegisterFactory(unsigned short) -std::__cxx1998::vector<OrderedEntry*, std::allocator<OrderedEntry*> >::~vector() std::__cxx1998::vector<SfxFilter*, std::allocator<SfxFilter*> >::~vector() std::__cxx1998::vector<SfxItemDesruptor_Impl*, std::allocator<SfxItemDesruptor_Impl*> >::~vector() std::__cxx1998::vector<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::~vector() |