summaryrefslogtreecommitdiffstats
path: root/dbaccess
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-01-19 09:13:03 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-01-19 13:26:27 +0100
commitbe8c414567f49242164b1fdfb12764b16be355c1 (patch)
treec1f505272ec27e5e069f5d6964dc4f7b20150a5a /dbaccess
parentnew loplugin:emptyif (diff)
downloadcore-be8c414567f49242164b1fdfb12764b16be355c1.tar.gz
core-be8c414567f49242164b1fdfb12764b16be355c1.zip
loplugin:unusedmethods also check for functions returning bool
we were previously excluding them Change-Id: I48a68799b0de60b4995fae541eb363e043d4dd11 Reviewed-on: https://gerrit.libreoffice.org/48167 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx3
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx7
-rw-r--r--dbaccess/source/ui/inc/QueryViewSwitch.hxx2
-rw-r--r--dbaccess/source/ui/inc/brwctrlr.hxx2
-rw-r--r--dbaccess/source/ui/inc/unodatbr.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryViewSwitch.cxx9
6 files changed, 9 insertions, 16 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index d917d79333c2..372bd7b8b2ef 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2607,9 +2607,8 @@ void SbaXDataBrowserController::addColumnListeners(const Reference< css::awt::XC
}
}
-bool SbaXDataBrowserController::InitializeGridModel(const Reference< css::form::XFormComponent > & /*xGrid*/)
+void SbaXDataBrowserController::InitializeGridModel(const Reference< css::form::XFormComponent > & /*xGrid*/)
{
- return true;
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index a66d68ff612b..2f14c616b6a5 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -576,7 +576,7 @@ void SbaTableQueryBrowser::initializePreviewMode()
}
}
-bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XFormComponent > & xGrid)
+void SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XFormComponent > & xGrid)
{
try
{
@@ -599,7 +599,7 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm
DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(m_pCurrentlyDisplayed->GetUserData());
OSL_ENSURE( pData->xObjectProperties.is(), "SbaTableQueryBrowser::InitializeGridModel: No table available!" );
if ( !pData->xObjectProperties.is() )
- return false;
+ return;
OUString* pStringIter = aProperties.getArray();
Any* pValueIter = aValues.getArray();
@@ -803,10 +803,7 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm
catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
- return false;
}
-
- return true;
}
Reference<XPropertySet> getColumnHelper(SvTreeListEntry const * _pCurrentlyDisplayed, const Reference<XPropertySet>& _rxSource)
diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
index 2be9eefe1991..23d207c2f227 100644
--- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx
+++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
@@ -72,7 +72,7 @@ namespace dbaui
void setSlotEnabled(sal_Int32 _nSlotId, bool _bEnable);
void setNoneVisbleRow(sal_Int32 _nRows);
void SaveUIConfig();
- bool reset();
+ void reset();
void GrabFocus();
// returns the add table dialog from the design view
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index e52f803d833c..fa38eb03e802 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -236,7 +236,7 @@ namespace dbaui
// do any initialization (data source etc.) here. the form should be fully functional after that.
// return sal_False if you didn't succeed (don't throw exceptions, they won't be caught)
- virtual bool InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid);
+ virtual void InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid);
css::uno::Reference< css::form::XFormComponent > CreateGridModel();
// our default implementation simply instantiates a stardiv.one.form.component.Grid service
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 8f149a104722..60f55d121218 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -205,7 +205,7 @@ namespace dbaui
private:
// SbaXDataBrowserController overridables
virtual bool InitializeForm( const css::uno::Reference< css::beans::XPropertySet >& i_formProperties ) override;
- virtual bool InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid) override;
+ virtual void InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid) override;
virtual bool preReloadForm() override;
virtual void postReloadForm() override;
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index ecef58f3bc9a..227720fc5c12 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -277,16 +277,13 @@ Reference< XComponentContext > const & OQueryViewSwitch::getORB() const
return m_pDesignView->getORB();
}
-bool OQueryViewSwitch::reset()
+void OQueryViewSwitch::reset()
{
m_pDesignView->reset();
if ( !m_pDesignView->initByParseIterator( nullptr ) )
- return false;
+ return;
- if ( switchView( nullptr ) )
- return false;
-
- return true;
+ switchView( nullptr );
}
void OQueryViewSwitch::setNoneVisbleRow(sal_Int32 _nRows)