summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-01-11 13:13:44 +0200
committerNoel Grandin <noel@peralex.com>2016-01-11 13:14:08 +0200
commit13e894bb522f17d530922abb8e6b787fb83091f7 (patch)
tree2b2487e49ea52b932786790d1ffd1b09451b30bb /framework
parentaa4dc893521291ace4828dc6ac390fab2b5ac6a7 (diff)
loplugin:unusedmethods unused return value in framework
Change-Id: I6e02f34702ba59a961c3fec3d025e775f4e26760
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/classes/fwktabwindow.hxx4
-rw-r--r--framework/inc/threadhelp/gate.hxx10
-rw-r--r--framework/inc/uielement/toolbarmanager.hxx2
-rw-r--r--framework/source/classes/fwktabwindow.cxx4
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx54
-rw-r--r--framework/source/uiconfiguration/globalsettings.cxx8
-rw-r--r--framework/source/uiconfiguration/uicategorydescription.cxx16
-rw-r--r--framework/source/uiconfiguration/windowstateconfiguration.cxx8
-rw-r--r--framework/source/uielement/toolbarmanager.cxx6
-rw-r--r--framework/source/uielement/uicommanddescription.cxx22
10 files changed, 44 insertions, 90 deletions
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index a13ed5487cc5..6fdea7a3f0e9 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -114,10 +114,10 @@ public:
void AddEventListener( const Link<VclWindowEvent&,void>& rEventListener );
void RemoveEventListener( const Link<VclWindowEvent&,void>& rEventListener );
- FwkTabPage* AddTabPage( sal_Int32 nIndex, const css::uno::Sequence< css::beans::NamedValue >& rProperties );
+ void AddTabPage( sal_Int32 nIndex, const css::uno::Sequence< css::beans::NamedValue >& rProperties );
void ActivatePage( sal_Int32 nIndex );
void RemovePage( sal_Int32 nIndex );
- virtual void Resize() override;
+ virtual void Resize() override;
};
} // namespace framework
diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index cb4a3fb12b9e..9ba5db898c56 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -108,17 +108,13 @@ class Gate : private boost::noncopyable
@seealso method open()
@param "pTimeOut", optional parameter to wait a certain time
- @return true, if wait was successful (gate was opened)
- false, if condition has an error or timeout was reached!
- @onerror We return false.
*//*-*****************************************************************************************************/
- bool wait(const TimeValue* pTimeOut = nullptr)
+ void wait(const TimeValue* pTimeOut = nullptr)
{
// We must safe access to our internal member!
::osl::ClearableMutexGuard aLock( m_aAccessLock );
// If gate not closed - caller can pass it.
- bool bSuccessful = true;
if( m_bClosed )
{
// Then we must release used access lock -
@@ -126,10 +122,8 @@ class Gate : private boost::noncopyable
// and if we hold the access lock nobody else can use this object without a deadlock!
aLock.clear();
// Wait for opening gate...
- bSuccessful = ( m_aPassage.wait( pTimeOut ) == ::osl::Condition::result_ok );
+ m_aPassage.wait( pTimeOut );
}
-
- return bSuccessful;
}
// private member
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 90f66edb5efd..cd912f1adb3d 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -146,7 +146,7 @@ class ToolBarManager : public ToolbarManager_Base
ToolBoxItemBits ConvertStyleToToolboxItemBits( sal_Int32 nStyle );
css::uno::Reference< css::frame::XModel > GetModelFromFrame() const;
bool IsPluginMode() const;
- long HandleClick(void ( SAL_CALL css::frame::XToolbarController::*_pClick )( ));
+ void HandleClick(void ( SAL_CALL css::frame::XToolbarController::*_pClick )( ));
void setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter);
void impl_elementChanged(bool _bRemove,const css::ui::ConfigurationEvent& Event );
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 1055ed04e6aa..2e0fb05ee66b 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -292,7 +292,7 @@ void FwkTabWindow::RemoveEventListener( const Link<VclWindowEvent&,void>& rEvent
m_aTabCtrl->RemoveEventListener( rEventListener );
}
-FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< beans::NamedValue >& rProperties )
+void FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< beans::NamedValue >& rProperties )
{
OUString sTitle, sToolTip, sPageURL;
uno::Reference< css::awt::XContainerWindowEventHandler > xEventHdl;
@@ -329,8 +329,6 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
m_aTabCtrl->SetPageImage( nIdx, Image( xImage ) );
if ( bDisabled )
m_aTabCtrl->EnablePage( nIdx, false );
-
- return pEntry->m_pPage;
}
void FwkTabWindow::ActivatePage( sal_Int32 nIndex )
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index aa39896eedf8..1820c21f79b9 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -242,22 +242,22 @@ class AddonsOptions_Impl : public ConfigItem
@return A list of configuration key names is returned.
*//*-*****************************************************************************************************/
- bool ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& aAddonMenuSeq );
- bool ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeMenuBarSeq );
- bool ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames );
+ void ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& aAddonMenuSeq );
+ void ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeMenuBarSeq );
+ void ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames );
bool ReadToolBarItemSet( const OUString& rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& aAddonOfficeToolBarSeq );
- bool ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeHelpMenuSeq );
+ void ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeHelpMenuSeq );
void ReadImages( ImageManager& aImageManager );
- bool ReadMenuMergeInstructions( MergeMenuInstructionContainer& rContainer );
- bool ReadToolbarMergeInstructions( ToolbarMergingInstructions& rToolbarMergeMap );
- bool ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& rContainer );
+ void ReadMenuMergeInstructions( MergeMenuInstructionContainer& rContainer );
+ void ReadToolbarMergeInstructions( ToolbarMergingInstructions& rToolbarMergeMap );
+ void ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& rContainer );
- bool ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu );
+ void ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu );
bool ReadMergeToolbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems );
bool ReadMergeStatusbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeStatusbar );
bool ReadMenuItem( const OUString& aMenuItemNodeName, Sequence< PropertyValue >& aMenuItem, bool bIgnoreSubMenu = false );
bool ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu );
- bool AppendPopupMenu( Sequence< PropertyValue >& aTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu );
+ void AppendPopupMenu( Sequence< PropertyValue >& aTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu );
bool ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem );
bool ReadStatusBarItem( const OUString& aStatusbarItemNodeName, Sequence< PropertyValue >& aStatusbarItem );
ImageEntry* ReadImageData( const OUString& aImagesNodeName );
@@ -534,7 +534,7 @@ Image AddonsOptions_Impl::GetImageFromURL( const OUString& aURL, bool bBig, bool
return aImage;
}
-bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& rAddonMenuSeq )
+void AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& rAddonMenuSeq )
{
// Read the AddonMenu set and fill property sequences
OUString aAddonMenuNodeName( "AddonUI/AddonMenu" );
@@ -566,11 +566,9 @@ bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >
rAddonMenuSeq[nIndex++] = aMenuItem;
}
}
-
- return ( rAddonMenuSeq.getLength() > 0 );
}
-bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeHelpMenuSeq )
+void AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeHelpMenuSeq )
{
// Read the AddonMenu set and fill property sequences
OUString aAddonHelpMenuNodeName( "AddonUI/OfficeHelp" );
@@ -602,11 +600,9 @@ bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue >
rAddonOfficeHelpMenuSeq[nIndex++] = aMenuItem;
}
}
-
- return ( rAddonOfficeHelpMenuSeq.getLength() > 0 );
}
-bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeMenuBarSeq )
+void AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeMenuBarSeq )
{
// Read the OfficeMenuBar set and fill property sequences
OUString aAddonMenuBarNodeName( "AddonUI/OfficeMenuBar" );
@@ -655,11 +651,9 @@ bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue
}
}
}
-
- return ( rAddonOfficeMenuBarSeq.getLength() > 0 );
}
-bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames )
+void AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames )
{
// Read the OfficeToolBar set and fill property sequences
OUString aAddonToolBarNodeName( "AddonUI/OfficeToolBar" );
@@ -675,8 +669,6 @@ bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBa
rAddonOfficeToolBars.push_back( m_aEmptyAddonToolBar );
ReadToolBarItemSet( aToolBarItemNode, rAddonOfficeToolBars[n] );
}
-
- return ( !rAddonOfficeToolBars.empty() );
}
bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString& rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq )
@@ -774,7 +766,7 @@ OUString AddonsOptions_Impl::GeneratePrefixURL()
return aPopupMenuURL;
}
-bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer )
+void AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer )
{
const OUString aMenuMergeRootName( "AddonUI/OfficeMenuBarMerging/" );
@@ -836,11 +828,9 @@ bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContaine
aContainer.push_back( aMergeMenuInstruction );
}
}
-
- return true;
}
-bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu )
+void AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu )
{
OUString aMergeMenuBaseNode( aMergeAddonInstructionBase+m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MENUITEMS ] );
@@ -851,10 +841,10 @@ bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructi
for ( sal_uInt32 i = 0; i < (sal_uInt32)aSubMenuNodeNames.getLength(); i++ )
aSubMenuNodeNames[i] = aMergeMenuBaseNode + aSubMenuNodeNames[i];
- return ReadSubMenuEntries( aSubMenuNodeNames, rMergeMenu );
+ ReadSubMenuEntries( aSubMenuNodeNames, rMergeMenu );
}
-bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& rCachedToolbarMergingInstructions )
+void AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& rCachedToolbarMergingInstructions )
{
const OUString aToolbarMergeRootName( "AddonUI/OfficeToolbarMerging/" );
@@ -922,8 +912,6 @@ bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstruction
rVector.push_back( aMergeToolbarInstruction );
}
}
-
- return true;
}
bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems )
@@ -936,7 +924,7 @@ bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstru
return ReadToolBarItemSet( aMergeToolbarBaseNode, rMergeToolbarItems );
}
-bool AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& aContainer )
+void AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& aContainer )
{
const ::rtl::OUString aStatusbarMergeRootName( "AddonUI/OfficeStatusbarMerging/" );
@@ -996,8 +984,6 @@ bool AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructi
aContainer.push_back( aMergeStatusbarInstruction );
}
}
-
- return true;
}
bool AddonsOptions_Impl::ReadMergeStatusbarData(
@@ -1179,7 +1165,7 @@ bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequ
return bResult;
}
-bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu )
+void AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu )
{
Sequence< Sequence< PropertyValue > > aTargetSubMenuSeq;
Sequence< Sequence< PropertyValue > > aSourceSubMenuSeq;
@@ -1193,8 +1179,6 @@ bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopu
aTargetSubMenuSeq[nIndex++] = aSourceSubMenuSeq[i];
rTargetPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Value <<= aTargetSubMenuSeq;
}
-
- return true;
}
bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem )
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index 80ec574f9d8d..2c72ab6c3b8a 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -72,7 +72,7 @@ class GlobalSettings_Access : public ::cppu::WeakImplHelper<
bool GetStateInfo( GlobalSettings::UIElementType eElementType, GlobalSettings::StateInfo eStateInfo, css::uno::Any& aValue );
private:
- bool impl_initConfigAccess();
+ void impl_initConfigAccess();
osl::Mutex m_mutex;
bool m_bDisposed : 1,
@@ -212,7 +212,7 @@ bool GlobalSettings_Access::GetStateInfo( GlobalSettings::UIElementType eElement
return false;
}
-bool GlobalSettings_Access::impl_initConfigAccess()
+void GlobalSettings_Access::impl_initConfigAccess()
{
css::uno::Sequence< css::uno::Any > aArgs( 2 );
css::beans::PropertyValue aPropValue;
@@ -241,8 +241,6 @@ bool GlobalSettings_Access::impl_initConfigAccess()
static_cast< cppu::OWeakObject* >( this ),
css::uno::UNO_QUERY ));
}
-
- return m_xConfigAccess.is();
}
catch ( const css::lang::WrappedTargetException& )
{
@@ -250,8 +248,6 @@ bool GlobalSettings_Access::impl_initConfigAccess()
catch ( const css::uno::Exception& )
{
}
-
- return false;
}
// global class
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 2dbe4d27ec83..0e9533018fc8 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -92,7 +92,7 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper<XNameAccess
Any getUINameFromID( const OUString& rId );
Any getUINameFromCache( const OUString& rId );
Sequence< OUString > getAllIds();
- bool fillCache();
+ void fillCache();
private:
typedef std::unordered_map< OUString,
@@ -100,7 +100,7 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper<XNameAccess
OUStringHash,
std::equal_to< OUString > > IdToInfoCache;
- bool initializeConfigAccess();
+ void initializeConfigAccess();
OUString m_aConfigCategoryAccess;
OUString m_aPropUIName;
@@ -185,12 +185,12 @@ throw ( RuntimeException, std::exception )
return sal_True;
}
-bool ConfigurationAccess_UICategory::fillCache()
+void ConfigurationAccess_UICategory::fillCache()
{
SAL_INFO( "fwk", "framework (cd100003) ::ConfigurationAccess_UICategory::fillCache" );
if ( m_bCacheFilled )
- return true;
+ return;
sal_Int32 i( 0 );
OUString aUIName;
@@ -217,8 +217,6 @@ bool ConfigurationAccess_UICategory::fillCache()
}
m_bCacheFilled = true;
-
- return true;
}
Any ConfigurationAccess_UICategory::getUINameFromID( const OUString& rId )
@@ -314,7 +312,7 @@ Sequence< OUString > ConfigurationAccess_UICategory::getAllIds()
return Sequence< OUString >();
}
-bool ConfigurationAccess_UICategory::initializeConfigAccess()
+void ConfigurationAccess_UICategory::initializeConfigAccess()
{
Sequence< Any > aArgs( 1 );
PropertyValue aPropValue;
@@ -337,8 +335,6 @@ bool ConfigurationAccess_UICategory::initializeConfigAccess()
xContainer->addContainerListener(m_xConfigListener);
}
}
-
- return true;
}
catch ( const WrappedTargetException& )
{
@@ -346,8 +342,6 @@ bool ConfigurationAccess_UICategory::initializeConfigAccess()
catch ( const Exception& )
{
}
-
- return false;
}
// container.XContainerListener
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 46a0919a24fe..71ddcfa9d427 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -213,7 +213,7 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper< XNameCon
Any impl_getSequenceFromStruct( const WindowStateInfo& rWinStateInfo );
void impl_fillStructFromSequence( WindowStateInfo& rWinStateInfo, const Sequence< PropertyValue >& rSeq );
Any impl_getWindowStateFromResourceURL( const OUString& rResourceURL );
- bool impl_initializeConfigAccess();
+ void impl_initializeConfigAccess();
private:
typedef std::unordered_map< OUString,
@@ -1236,7 +1236,7 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window
}
}
-bool ConfigurationAccess_WindowState::impl_initializeConfigAccess()
+void ConfigurationAccess_WindowState::impl_initializeConfigAccess()
{
Sequence< Any > aArgs( 2 );
PropertyValue aPropValue;
@@ -1262,8 +1262,6 @@ bool ConfigurationAccess_WindowState::impl_initializeConfigAccess()
xContainer->addContainerListener(m_xConfigListener);
}
}
-
- return true;
}
catch ( const WrappedTargetException& )
{
@@ -1271,8 +1269,6 @@ bool ConfigurationAccess_WindowState::impl_initializeConfigAccess()
catch ( const Exception& )
{
}
-
- return false;
}
typedef ::cppu::WeakComponentImplHelper< css::container::XNameAccess,
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 116a3ab93716..d20a81bd4bf4 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1242,12 +1242,13 @@ void ToolBarManager::notifyRegisteredControllers( const OUString& aUIElementName
}
}
}
-long ToolBarManager::HandleClick(void ( SAL_CALL XToolbarController::*_pClick )())
+
+void ToolBarManager::HandleClick(void ( SAL_CALL XToolbarController::*_pClick )())
{
SolarMutexGuard g;
if ( m_bDisposed )
- return 1;
+ return;
sal_uInt16 nId( m_pToolBar->GetCurItemId() );
ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
@@ -1258,7 +1259,6 @@ long ToolBarManager::HandleClick(void ( SAL_CALL XToolbarController::*_pClick )(
if ( xController.is() )
(xController.get()->*_pClick)( );
}
- return 1;
}
IMPL_LINK_NOARG_TYPED(ToolBarManager, Click, ToolBox *, void)
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 9ab14624835f..9b024cb2f32c 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -132,8 +132,8 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
Any getInfoFromCommand( const OUString& rCommandURL );
void fillInfoFromResult( CmdToInfoMap& rCmdInfo, const OUString& aLabel );
Sequence< OUString > getAllCommands();
- bool fillCache();
- bool addGenericInfoToCache();
+ void fillCache();
+ void addGenericInfoToCache();
void impl_fill(const Reference< XNameAccess >& _xConfigAccess,bool _bPopup,
std::vector< OUString >& aImageCommandVector,
std::vector< OUString >& aImageRotateVector,
@@ -145,7 +145,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
OUStringHash,
std::equal_to< OUString > > CommandToInfoCache;
- bool initializeConfigAccess();
+ void initializeConfigAccess();
OUString m_aConfigCmdAccess;
OUString m_aConfigPopupAccess;
@@ -370,11 +370,11 @@ void ConfigurationAccess_UICommand::impl_fill(const Reference< XNameAccess >& _x
}
}
}
-bool ConfigurationAccess_UICommand::fillCache()
+void ConfigurationAccess_UICommand::fillCache()
{
if ( m_bCacheFilled )
- return true;
+ return;
std::vector< OUString > aImageCommandVector;
std::vector< OUString > aImageRotateVector;
@@ -388,11 +388,9 @@ bool ConfigurationAccess_UICommand::fillCache()
m_aCommandMirrorImageList = comphelper::containerToSequence( aImageMirrorVector );
m_bCacheFilled = true;
-
- return true;
}
-bool ConfigurationAccess_UICommand::addGenericInfoToCache()
+void ConfigurationAccess_UICommand::addGenericInfoToCache()
{
if ( m_xGenericUICommands.is() && !m_bGenericDataRetrieved )
{
@@ -427,8 +425,6 @@ bool ConfigurationAccess_UICommand::addGenericInfoToCache()
m_bGenericDataRetrieved = true;
}
-
- return true;
}
Any ConfigurationAccess_UICommand::getInfoFromCommand( const OUString& rCommandURL )
@@ -514,7 +510,7 @@ Sequence< OUString > ConfigurationAccess_UICommand::getAllCommands()
return Sequence< OUString >();
}
-bool ConfigurationAccess_UICommand::initializeConfigAccess()
+void ConfigurationAccess_UICommand::initializeConfigAccess()
{
Sequence< Any > aArgs( 1 );
PropertyValue aPropValue;
@@ -552,8 +548,6 @@ bool ConfigurationAccess_UICommand::initializeConfigAccess()
xContainer->addContainerListener(m_xConfigAccessListener);
}
}
-
- return true;
}
catch (const WrappedTargetException&)
{
@@ -561,8 +555,6 @@ bool ConfigurationAccess_UICommand::initializeConfigAccess()
catch (const Exception&)
{
}
-
- return false;
}
// container.XContainerListener