filter/source/svg/svgexport.cxx | 46 ++------
filter/source/svg/svgfilter.hxx | 14 +-
filter/source/svg/svgwriter.cxx | 4
filter/source/svg/svgwriter.hxx | 5
filter/source/xsltdialog/xmlfiltertabpagebasic.cxx | 4
filter/source/xsltdialog/xmlfiltertabpagebasic.hxx | 2
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 4
filter/source/xsltdialog/xmlfiltertabpagexslt.hxx | 2
forms/source/component/FormComponent.cxx | 4
forms/source/component/GroupManager.cxx | 5
forms/source/component/GroupManager.hxx | 2
forms/source/inc/FormComponent.hxx | 2
forms/source/runtime/formoperations.cxx | 16 +-
forms/source/runtime/formoperations.hxx | 4
forms/source/xforms/pathexpression.cxx | 8 -
forms/source/xforms/pathexpression.hxx | 2
framework/inc/classes/fwktabwindow.hxx | 4
framework/inc/threadhelp/gate.hxx | 10 -
framework/inc/uielement/toolbarmanager.hxx | 2
framework/source/classes/fwktabwindow.cxx | 4
framework/source/fwe/classes/addonsoptions.cxx | 54 +++-------
framework/source/uiconfiguration/globalsettings.cxx | 8 -
framework/source/uiconfiguration/uicategorydescription.cxx | 16 --
framework/source/uiconfiguration/windowstateconfiguration.cxx | 8 -
framework/source/uielement/toolbarmanager.cxx | 6 -
framework/source/uielement/uicommanddescription.cxx | 22 +---
26 files changed, 84 insertions(+), 174 deletions(-)
New commits:
commit 13e894bb522f17d530922abb8e6b787fb83091f7
Author: Noel Grandin <n...@peralex.com>
Date: Mon Jan 11 13:13:44 2016 +0200
loplugin:unusedmethods unused return value in framework
Change-Id: I6e02f34702ba59a961c3fec3d025e775f4e26760
diff --git a/framework/inc/classes/fwktabwindow.hxx
b/framework/inc/classes/fwktabwindow.hxx
index a13ed54..6fdea7a 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 cb4a3fb..9ba5db8 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 90f66ed..cd912f1 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 1055ed0..2e0fb05 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 aa39896..1820c21 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 80ec574..2c72ab6 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 2dbe4d2..0e95330 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 46a0919..71ddcfa 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 116a3ab..d20a81b 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 9ab1462..9b024cb 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
commit aa4dc893521291ace4828dc6ac390fab2b5ac6a7
Author: Noel Grandin <n...@peralex.com>
Date: Mon Jan 11 13:13:33 2016 +0200
loplugin:unusedmethods unused return value in forms
Change-Id: I9da3e72ca12e040e7fb5bea7ccaa071edfd34f27
diff --git a/forms/source/component/FormComponent.cxx
b/forms/source/component/FormComponent.cxx
index 544949d..7d73658 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -1924,7 +1924,7 @@ void OBoundControlModel::resetField()
m_nFieldType = DataType::OTHER;
}
-bool OBoundControlModel::connectToField(const Reference<XRowSet>& rForm)
+void OBoundControlModel::connectToField(const Reference<XRowSet>& rForm)
{
OSL_PRECOND( !hasExternalValueBinding(),
"OBoundControlModel::connectToField: invalid call (have an external binding)!"
);
// if there's a connection to the database
@@ -1992,7 +1992,7 @@ bool OBoundControlModel::connectToField(const
Reference<XRowSet>& rForm)
}
}
- return hasField();
+ hasField();
}
void OBoundControlModel::initFromField( const Reference< XRowSet >& _rxRowSet )
diff --git a/forms/source/component/GroupManager.cxx
b/forms/source/component/GroupManager.cxx
index d0a33ab..46cc2ca 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -180,11 +180,6 @@ void OGroup::RemoveComponent( const
Reference<XPropertySet>& rxElement )
}
}
-bool OGroup::operator==( const OGroup& rGroup ) const
-{
- return m_aGroupName.equals(rGroup.GetGroupName());
-}
-
Sequence< Reference<XControlModel> > OGroup::GetControlModels() const
{
sal_Int32 nLen = m_aCompArray.size();
diff --git a/forms/source/component/GroupManager.hxx
b/forms/source/component/GroupManager.hxx
index d7abf144..a9e3d8e 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -145,8 +145,6 @@ public:
explicit OGroup(const OUString& rGroupName);
virtual ~OGroup();
- bool operator==( const OGroup& rGroup ) const;
-
OUString GetGroupName() const { return m_aGroupName; }
css::uno::Sequence< css::uno::Reference< css::awt::XControlModel> >
GetControlModels() const;
diff --git a/forms/source/inc/FormComponent.hxx
b/forms/source/inc/FormComponent.hxx
index 40c5309..d15b121 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -1106,7 +1106,7 @@ protected:
void initFromField( const css::uno::Reference< css::sdbc::XRowSet>&
_rxForm );
private:
- bool connectToField( const css::uno::Reference< css::sdbc::XRowSet>&
_rxForm );
+ void connectToField( const css::uno::Reference<
css::sdbc::XRowSet>& _rxForm );
void resetField();
/** does a new validation of the control value
diff --git a/forms/source/runtime/formoperations.cxx
b/forms/source/runtime/formoperations.cxx
index bdd507f..33a2fa1 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -1448,17 +1448,17 @@ namespace frm
}
- bool FormOperations::impl_moveLeft_throw( ) const
+ void FormOperations::impl_moveLeft_throw( ) const
{
OSL_PRECOND( impl_hasCursor_nothrow(),
"FormOperations::impl_moveLeft_throw: no cursor!" );
if ( !impl_hasCursor_nothrow() )
- return false;
+ return;
sal_Bool bRecordInserted = sal_False;
bool bSuccess = impl_commitCurrentRecord_throw( &bRecordInserted );
if ( !bSuccess )
- return false;
+ return;
if ( bRecordInserted )
{
@@ -1479,22 +1479,20 @@ namespace frm
else
m_xCursor->previous();
}
-
- return true;
}
- bool FormOperations::impl_moveRight_throw( ) const
+ void FormOperations::impl_moveRight_throw( ) const
{
OSL_PRECOND( impl_hasCursor_nothrow(),
"FormOperations::impl_moveRight_throw: no cursor!" );
if ( !impl_hasCursor_nothrow() )
- return false;
+ return;
sal_Bool bRecordInserted = sal_False;
bool bSuccess = impl_commitCurrentRecord_throw( &bRecordInserted );
if ( !bSuccess )
- return false;
+ return;
if ( bRecordInserted )
{
@@ -1508,8 +1506,6 @@ namespace frm
else
(void)m_xCursor->next();
}
-
- return true;
}
diff --git a/forms/source/runtime/formoperations.hxx
b/forms/source/runtime/formoperations.hxx
index 08ee866..e01bc88 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -254,7 +254,7 @@ namespace frm
@precond
canMoveLeft()
*/
- bool impl_moveLeft_throw() const;
+ void impl_moveLeft_throw() const;
/** moves our cursor one position to the right, caring for different
possible
cursor states.
@@ -264,7 +264,7 @@ namespace frm
@precond
canMoveRight()
*/
- bool impl_moveRight_throw( ) const;
+ void impl_moveRight_throw( ) const;
/** impl-version of commitCurrentRecord, which can be called without
caring for
an output parameter, and within const-contexts
diff --git a/forms/source/xforms/pathexpression.cxx
b/forms/source/xforms/pathexpression.cxx
index c827322..b2049ee 100644
--- a/forms/source/xforms/pathexpression.cxx
+++ b/forms/source/xforms/pathexpression.cxx
@@ -95,14 +95,14 @@ const OUString
PathExpression::_getExpressionForEvaluation() const
return sExpr;
}
-bool PathExpression::evaluate( const EvaluationContext& rContext )
+void PathExpression::evaluate( const EvaluationContext& rContext )
{
// for simple expression we don't need to re-bind (if we were bound before)
// (we will evaluate empty expressions, since they are interpreted as ".")
if( mxResult.is() && isSimpleExpression() )
- return true;
+ return;
- bool bResult = _evaluate( rContext, _getExpressionForEvaluation() );
+ _evaluate( rContext, _getExpressionForEvaluation() );
// clear old result, and copy new
maNodes.clear();
@@ -115,8 +115,6 @@ bool PathExpression::evaluate( const EvaluationContext&
rContext )
for( sal_Int32 n = 0; n < nLength; n++ )
maNodes.push_back( xNodeList->item( n ) );
}
-
- return bResult;
}
diff --git a/forms/source/xforms/pathexpression.hxx
b/forms/source/xforms/pathexpression.hxx
index 38410f2..3721ca7 100644
--- a/forms/source/xforms/pathexpression.hxx
+++ b/forms/source/xforms/pathexpression.hxx
@@ -65,7 +65,7 @@ public:
/// evaluate the expression relative to the content node.
- bool evaluate( const xforms::EvaluationContext& rContext );
+ void evaluate( const xforms::EvaluationContext& rContext );
// get the result of this expression as node/node list/...
commit 7a658373496fc41f40c5019870456dca3a9f6ecc
Author: Noel Grandin <n...@peralex.com>
Date: Mon Jan 11 13:13:24 2016 +0200
loplugin:unusedmethods unused return value in filter
Change-Id: I42b24bed84ab9b745041166610732d9a074b5f72
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index a3f7ed7..ef97fd9 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -957,9 +957,8 @@ OUString implGenerateFieldId( std::vector< TextField* > &
aFieldSet,
-bool SVGFilter::implGenerateMetaData()
+void SVGFilter::implGenerateMetaData()
{
- bool bRet = false;
sal_Int32 nCount = mSelectedPages.getLength();
if( nCount != 0 )
{
@@ -1184,18 +1183,13 @@ bool SVGFilter::implGenerateMetaData()
}
}
}
- bRet = true;
}
-
- return bRet;
}
-bool SVGFilter::implExportAnimations()
+void SVGFilter::implExportAnimations()
{
- bool bRet = false;
-
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id",
"presentation-animations" );
SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE,
"defs", true, true );
@@ -1251,9 +1245,6 @@ bool SVGFilter::implExportAnimations()
}
}
}
-
- bRet = true;
- return bRet;
}
@@ -1336,7 +1327,7 @@ void SVGFilter::implEmbedBulletGlyph( sal_Unicode
cBullet, const OUString & sPat
* We export bitmaps embedded into text shapes, such as those used by list
* items with image style, only once in a specific <defs> element.
*/
-bool SVGFilter::implExportTextEmbeddedBitmaps()
+void SVGFilter::implExportTextEmbeddedBitmaps()
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class",
"TextEmbeddedBitmaps" );
SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE,
"defs", true, true );
@@ -1382,23 +1373,21 @@ bool SVGFilter::implExportTextEmbeddedBitmaps()
else
{
OSL_FAIL( "implExportTextEmbeddedBitmaps: no shape
bounding box." );
- return false;
+ return;
}
}
else
{
OSL_FAIL( "implExportTextEmbeddedBitmaps: metafile should have
MetaBmpExScaleAction only." );
- return false;
+ return;
}
}
else
{
OSL_FAIL( "implExportTextEmbeddedBitmaps: metafile should have a
single action." );
- return false;
+ return;
}
-
}
- return true;
}
@@ -1406,7 +1395,7 @@ bool SVGFilter::implExportTextEmbeddedBitmaps()
#define SVGFILTER_EXPORT_SVGSCRIPT( z, n, aFragment ) \
xExtDocHandler->unknown( aFragment ## n );
-bool SVGFilter::implGenerateScript()
+void SVGFilter::implGenerateScript()
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "type", "text/ecmascript" );
@@ -1419,8 +1408,6 @@ bool SVGFilter::implGenerateScript()
BOOST_PP_REPEAT( N_SVGSCRIPT_FRAGMENTS,
SVGFILTER_EXPORT_SVGSCRIPT, aSVGScript )
}
}
-
- return true;
}
@@ -1446,10 +1433,8 @@ Any SVGFilter::implSafeGetPagePropSet( const OUString &
sPropertyName,
* This method is used when exporting a single page
* as implGenerateMetaData is not invoked.
*/
-bool SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
+void SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
{
- bool bRet = false;
-
mVisiblePagePropSet.bIsBackgroundVisible = true;
mVisiblePagePropSet.bAreBackgroundObjectsVisible = true;
mVisiblePagePropSet.bIsPageNumberFieldVisible = false;
@@ -1493,12 +1478,8 @@ bool SVGFilter::implGetPagePropSet( const Reference<
XDrawPage > & rxPage )
mVisiblePagePropSet.nPageNumberingType =
pSdrModel->GetPageNumType();
}
}
-
- bRet = true;
}
}
-
- return bRet;
}
@@ -1558,7 +1539,7 @@ bool SVGFilter::implExportMasterPages( const std::vector<
Reference< XDrawPage >
-bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence &
rxPages,
+void SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence &
rxPages,
sal_Int32 nFirstPage, sal_Int32
nLastPage )
{
DBG_ASSERT( nFirstPage <= nLastPage,
@@ -1590,7 +1571,6 @@ bool SVGFilter::implExportDrawPages( const
SVGFilter::XDrawPageSequence & rxPage
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "SlideGroup" );
SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true
);
- bool bRet = false;
for( sal_Int32 i = nFirstPage; i <= nLastPage; ++i )
{
Reference< XShapes > xShapes;
@@ -1642,13 +1622,11 @@ bool SVGFilter::implExportDrawPages( const
SVGFilter::XDrawPageSequence & rxPage
SvXMLElementExport aSlideElement( *mpSVGExport,
XML_NAMESPACE_NONE, "g", true, true );
- bRet = implExportPage( sPageId, rxPages[i], xShapes, false
/* is not a master page */ ) || bRet;
+ implExportPage( sPageId, rxPages[i], xShapes, false /* is
not a master page */ );
}
} // append the </g> closing tag related to inserted elements
} // append the </g> closing tag related to the svg element handling
the slide visibility
}
-
- return bRet;
}
@@ -2151,7 +2129,7 @@ bool SVGFilter::implCreateObjectsFromShape( const
Reference< XDrawPage > & rxPag
-bool SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >&
rxDrawPage )
+void SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >&
rxDrawPage )
{
Reference< XGraphicExportFilter > xExporter =
drawing::GraphicExportFilter::create( mxContext );
@@ -2173,8 +2151,6 @@ bool SVGFilter::implCreateObjectsFromBackground( const
Reference< XDrawPage >& r
aMtf.Read( *aFile.GetStream( StreamMode::READ ) );
(*mpObjects)[ rxDrawPage ] = ObjectRepresentation( rxDrawPage, aMtf );
-
- return true;
}
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 1e64c8b..89544ad 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -252,20 +252,20 @@ private:
bool implExport( const Sequence< PropertyValue
>& rDescriptor ) throw (RuntimeException, std::exception);
static Reference< XWriter > implCreateExportDocumentHandler( const
Reference< XOutputStream >& rxOStm );
- bool implGetPagePropSet( const Reference<
XDrawPage > & rxPage );
- bool implGenerateMetaData();
+ void implGetPagePropSet( const Reference<
XDrawPage > & rxPage );
+ void implGenerateMetaData();
void implExportTextShapeIndex();
void implEmbedBulletGlyphs();
void implEmbedBulletGlyph( sal_Unicode cBullet,
const OUString & sPathData );
- bool implExportTextEmbeddedBitmaps();
- bool implGenerateScript();
+ void implExportTextEmbeddedBitmaps();
+ void implGenerateScript();
bool implExportDocument();
- bool implExportAnimations();
+ void implExportAnimations();
bool implExportMasterPages( const std::vector<
Reference< XDrawPage > >& rxPages,
sal_Int32
nFirstPage, sal_Int32 nLastPage );
- bool implExportDrawPages( const
XDrawPageSequence& rxPages,
+ void implExportDrawPages( const
XDrawPageSequence& rxPages,
sal_Int32
nFirstPage, sal_Int32 nLastPage );
bool implExportPage( const OUString & sPageId,
const Reference<
XDrawPage > & rxPage,
@@ -280,7 +280,7 @@ private:
bool implCreateObjects();
bool implCreateObjectsFromShapes( const
Reference< XDrawPage > & rxPage, const Reference< XShapes >& rxShapes );
bool implCreateObjectsFromShape( const
Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape );
- bool implCreateObjectsFromBackground( const
Reference< XDrawPage >& rxMasterPage );
+ void implCreateObjectsFromBackground( const
Reference< XDrawPage >& rxMasterPage );
static OUString implGetClassFromShape( const Reference<
XShape >& rxShape );
void implRegisterInterface( const Reference<
XInterface >& rxIf );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index ceb2dec..8613369 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -858,7 +858,7 @@ void SVGTextWriter::implSetFontFamily()
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontFamily, sFontFamily
);
}
-bool SVGTextWriter::createParagraphEnumeration()
+void SVGTextWriter::createParagraphEnumeration()
{
if( mrTextShape.is() )
{
@@ -869,7 +869,6 @@ bool SVGTextWriter::createParagraphEnumeration()
if( xEnumeration.is() )
{
mrParagraphEnumeration.set( xEnumeration );
- return true;
}
else
{
@@ -880,7 +879,6 @@ bool SVGTextWriter::createParagraphEnumeration()
{
OSL_FAIL( "SVGTextWriter::createParagraphEnumeration: no valid XText
interface found." );
}
- return false;
}
bool SVGTextWriter::nextParagraph()
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index a0413be..9d9f3e4 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -211,7 +211,7 @@ class SVGTextWriter
void setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAction );
void addFontAttributes( bool bIsTextContainer );
- bool createParagraphEnumeration();
+ void createParagraphEnumeration();
bool nextParagraph();
bool nextTextPortion();
@@ -293,11 +293,10 @@ private:
bool mbIsPlaceholderShape;
- SVGAttributeWriter* ImplAcquireContext()
+ void ImplAcquireContext()
{
maContextStack.push( mpContext = new SVGAttributeWriter( mrExport,
mrFontExport ) );
maTextWriter.setContext( mpContext );
- return mpContext;
}
void ImplReleaseContext()
{
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
index 3f4d285..8739824 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
@@ -83,7 +83,7 @@ static OUString checkExtensions( const OUString& rExtensions )
return aRet;
}
-bool XMLFilterTabPageBasic::FillInfo( filter_info_impl* pInfo )
+void XMLFilterTabPageBasic::FillInfo( filter_info_impl* pInfo )
{
if( pInfo )
{
@@ -118,8 +118,6 @@ bool XMLFilterTabPageBasic::FillInfo( filter_info_impl*
pInfo )
}
}
}
-
- return true;
}
void XMLFilterTabPageBasic::SetInfo(const filter_info_impl* pInfo)
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
index cc90664..e5809fa 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
@@ -36,7 +36,7 @@ public:
virtual ~XMLFilterTabPageBasic();
virtual void dispose() override;
- bool FillInfo( filter_info_impl* pInfo );
+ void FillInfo( filter_info_impl* pInfo );
void SetInfo(const filter_info_impl* pInfo);
VclPtr<Edit> m_pEDFilterName;
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 8f844c8..47e24a9 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -74,7 +74,7 @@ void XMLFilterTabPageXSLT::dispose()
TabPage::dispose();
}
-bool XMLFilterTabPageXSLT::FillInfo( filter_info_impl* pInfo )
+void XMLFilterTabPageXSLT::FillInfo( filter_info_impl* pInfo )
{
if( pInfo )
{
@@ -84,8 +84,6 @@ bool XMLFilterTabPageXSLT::FillInfo( filter_info_impl* pInfo )
pInfo->maImportTemplate = GetURL( m_pEDImportTemplate );
pInfo->mbNeedsXSLT2 = m_pCBNeedsXSLT2->IsChecked();
}
-
- return true;
}
void XMLFilterTabPageXSLT::SetInfo(const filter_info_impl* pInfo)
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
index 054f3e1..7b0309c 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
@@ -37,7 +37,7 @@ public:
virtual ~XMLFilterTabPageXSLT();
virtual void dispose() override;
- bool FillInfo( filter_info_impl* pInfo );
+ void FillInfo( filter_info_impl* pInfo );
void SetInfo(const filter_info_impl* pInfo);
DECL_LINK_TYPED( ClickBrowseHdl_Impl, Button *, void );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
