[Libreoffice-commits] core.git: dbaccess/source
Noel Grandin
noel at peralex.com
Wed Oct 5 10:37:29 UTC 2016
dbaccess/source/core/api/BookmarkSet.cxx | 5 --
dbaccess/source/core/api/BookmarkSet.hxx | 1
dbaccess/source/core/api/WrappedResultSet.cxx | 5 --
dbaccess/source/core/api/WrappedResultSet.hxx | 1
dbaccess/source/core/api/table.cxx | 2
dbaccess/source/core/inc/table.hxx | 2
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 15 -------
dbaccess/source/ext/macromigration/macromigrationdialog.hxx | 3 -
dbaccess/source/filter/xml/xmlExport.cxx | 5 --
dbaccess/source/filter/xml/xmlExport.hxx | 1
dbaccess/source/ui/app/AppController.cxx | 25 ------------
dbaccess/source/ui/app/AppController.hxx | 8 ---
dbaccess/source/ui/browser/sbagrid.cxx | 5 --
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 5 --
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 3 -
dbaccess/source/ui/inc/querycontroller.hxx | 4 -
dbaccess/source/ui/inc/sbagrid.hxx | 1
dbaccess/source/ui/querydesign/QTableWindow.cxx | 5 --
dbaccess/source/ui/querydesign/QTableWindow.hxx | 1
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 5 --
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 1
dbaccess/source/ui/querydesign/querycontroller.cxx | 5 --
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 7 ---
23 files changed, 1 insertion(+), 114 deletions(-)
New commits:
commit 1e3996ce83b786fc61cedda0ec8f9a9ad358f032
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 5 12:34:24 2016 +0200
loplugin:unnecessaryoverride in dbaccess
Change-Id: I458092403faa46f80957a55b48374678e196de11
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index d3869e0..57e685b 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -126,11 +126,6 @@ void SAL_CALL OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const c
xUpd->deleteRow();
}
-void OBookmarkSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
-{
- OCacheSet::fillValueRow(_rRow,_nPosition);
-}
-
void OBookmarkSet::updateColumn(sal_Int32 nPos, const Reference< XRowUpdate >& _xParameter, const ORowSetValue& _rValue)
{
if(_rValue.isBound() && _rValue.isModified())
diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx
index 824f5ac..ae44493 100644
--- a/dbaccess/source/core/api/BookmarkSet.hxx
+++ b/dbaccess/source/core/api/BookmarkSet.hxx
@@ -41,7 +41,6 @@ namespace dbaccess
virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override;
virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) override;
- virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition) override;
// css::sdbcx::XRowLocate
virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index 09181e6..09fd801 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -110,11 +110,6 @@ void SAL_CALL WrappedResultSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,con
m_xUpd->deleteRow();
}
-void WrappedResultSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
-{
- OCacheSet::fillValueRow(_rRow,_nPosition);
-}
-
void WrappedResultSet::updateColumn(sal_Int32 nPos, const Reference< XRowUpdate >& _xParameter, const ORowSetValue& _rValue)
{
if(_rValue.isBound() && _rValue.isModified())
diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx
index d855c81..c6ca18a 100644
--- a/dbaccess/source/core/api/WrappedResultSet.hxx
+++ b/dbaccess/source/core/api/WrappedResultSet.hxx
@@ -44,7 +44,6 @@ namespace dbaccess
virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override;
virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) override;
- virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition) override;
// css::sdbcx::XRowLocate
virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index 61f6715..85aeaea 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -94,8 +94,6 @@ ODBTable::~ODBTable()
{
}
-IMPLEMENT_FORWARD_REFCOUNT(ODBTable,OTable_Base)
-
OColumn* ODBTable::createColumn(const OUString& _rName) const
{
OColumn* pReturn = nullptr;
diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx
index 8ecc53c..8242102 100644
--- a/dbaccess/source/core/inc/table.hxx
+++ b/dbaccess/source/core/inc/table.hxx
@@ -122,7 +122,7 @@ namespace dbaccess
virtual void construct() override;
//XInterface
- DECLARE_XINTERFACE()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
//XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index ad6916f..bc80b74 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -257,21 +257,6 @@ namespace dbmm
return true;
}
- bool MacroMigrationDialog::leaveState( WizardState _nState )
- {
- return MacroMigrationDialog_Base::leaveState( _nState );
- }
-
- MacroMigrationDialog::WizardState MacroMigrationDialog::determineNextState( WizardState _nCurrentState ) const
- {
- return MacroMigrationDialog_Base::determineNextState( _nCurrentState );
- }
-
- bool MacroMigrationDialog::onFinish()
- {
- return MacroMigrationDialog_Base::onFinish();
- }
-
IMPL_LINK_NOARG( MacroMigrationDialog, OnStartMigration, void*, void )
{
// prevent closing
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
index 28ef816..3c21c08 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
@@ -50,9 +50,6 @@ namespace dbmm
// OWizardMachine overridables
virtual void enterState( WizardState _nState ) override;
virtual bool prepareLeaveCurrentState( CommitPageReason _eReason ) override;
- virtual bool leaveState( WizardState _nState ) override;
- virtual WizardState determineNextState( WizardState _nCurrentState ) const override;
- virtual bool onFinish() override;
// Dialog overridables
virtual bool Close() override;
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 735586a..43d530d 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -1260,11 +1260,6 @@ void ODBExport::ExportAutoStyles_()
}
}
-void ODBExport::ExportStyles_(bool bUsed)
-{
- SvXMLExport::ExportStyles_(bUsed);
-}
-
void ODBExport::GetViewSettings(Sequence<PropertyValue>& aProps)
{
Reference<XQueryDefinitionsSupplier> xSup(getDataSource(),UNO_QUERY);
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index f10ca8e..3949daf 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -159,7 +159,6 @@ class ODBExport : public SvXMLExport
ODBExport() = delete;
protected:
- virtual void ExportStyles_( bool bUsed ) override;
virtual void ExportAutoStyles_() override;
virtual void ExportContent_() override;
virtual void ExportMasterStyles_() override;
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 9aa1a83..7b134ef 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2281,31 +2281,6 @@ void OApplicationController::onDeleteEntry()
executeChecked(nId,Sequence<PropertyValue>());
}
-void OApplicationController::executeUnChecked(sal_uInt16 _nCommandId, const Sequence< PropertyValue>& aArgs)
-{
- OGenericUnoController::executeUnChecked( _nCommandId, aArgs );
-}
-
-void OApplicationController::executeChecked(sal_uInt16 _nCommandId, const Sequence< PropertyValue>& aArgs)
-{
- OGenericUnoController::executeChecked( _nCommandId, aArgs );
-}
-
-bool OApplicationController::isCommandEnabled(sal_uInt16 _nCommandId) const
-{
- return OGenericUnoController::isCommandEnabled( _nCommandId );
-}
-
-bool OApplicationController::isCommandEnabled( const OUString& _rCompleteCommandURL ) const
-{
- return OGenericUnoController::isCommandEnabled( _rCompleteCommandURL );
-}
-
-Reference< XController > OApplicationController::getXController() throw( RuntimeException )
-{
- return OGenericUnoController::getXController();
-}
-
VclPtr<PopupMenu> OApplicationController::getContextMenu( Control& /*_rControl*/ ) const
{
return VclPtr<PopupMenu>::Create( ModuleRes( RID_MENU_APP_EDIT ) );
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 928a46e..ded0069 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -512,15 +512,7 @@ namespace dbaui
void containerFound( const css::uno::Reference< css::container::XContainer >& _xContainer);
// IController
- using OGenericUnoController::executeUnChecked;
- virtual void executeUnChecked(sal_uInt16 _nCommandId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override;
- using OGenericUnoController::executeChecked;
- virtual void executeChecked(sal_uInt16 _nCommandId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override;
- virtual bool isCommandEnabled(sal_uInt16 _nCommandId) const override;
- virtual bool isCommandEnabled( const OUString& _rCompleteCommandURL ) const override;
virtual bool isDataSourceReadOnly() const override;
- virtual css::uno::Reference< css::frame::XController >
- getXController() throw( css::uno::RuntimeException ) override;
// IControlActionListener overridables
virtual bool requestQuickHelp( const SvTreeListEntry* _pEntry, OUString& _rText ) const override;
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 7092450..983ab27 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -925,11 +925,6 @@ void SbaGridControl::Select()
m_pMasterListener->SelectionChanged();
}
-void SbaGridControl::CursorMoved()
-{
- FmGridControl::CursorMoved();
-}
-
void SbaGridControl::ActivateCell(long nRow, sal_uInt16 nCol, bool bSetCellFocus /*= sal_True*/ )
{
FmGridControl::ActivateCell(nRow, nCol, bSetCellFocus);
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 729acc5..ca7b62e 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -722,11 +722,6 @@ using namespace ::com::sun::star;
}
- void OSpreadSheetConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
- {
- OConnectionTabPageSetup::implInitControls(_rSet, _bSaveValue);
- }
-
bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
{
bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 3a4c168..cbdb3e2 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -48,11 +48,8 @@ namespace dbaui
protected:
VclPtr<CheckBox> m_pPasswordrequired;
- protected:
- virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override;
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override;
-
};
// OTextConnectionPage
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index 966f4f1..1d99b4c 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -191,10 +191,6 @@ namespace dbaui
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
// OPropertySetHelper
- virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
- sal_Int32 nHandle,
- const css::uno::Any& rValue
- ) throw (css::uno::Exception, std::exception ) override;
virtual void SAL_CALL getFastPropertyValue(
css::uno::Any& rValue,
sal_Int32 nHandle
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index f7feedc..5a79761 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -261,7 +261,6 @@ namespace dbaui
virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) override;
// BrowseBox overridables
- virtual void CursorMoved() override;
virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ) override;
virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) override;
virtual void MouseButtonDown( const BrowserMouseEvent& rMEvt) override;
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 041c4d0..6f5ae57 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -184,9 +184,4 @@ bool OQueryTableWindow::ExistsAVisitedConn() const
return static_cast<const OQueryTableView*>(getTableView())->ExistsAVisitedConn(this);
}
-void OQueryTableWindow::KeyInput( const KeyEvent& rEvt )
-{
- OTableWindow::KeyInput( rEvt );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx
index e9cb775..e9ac4e6 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.hxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx
@@ -50,7 +50,6 @@ namespace dbaui
virtual OUString GetName() const override { return GetWinName(); }
protected:
- virtual void KeyInput( const KeyEvent& rEvt ) override;
virtual void OnEntryDoubleClicked(SvTreeListEntry* pEntry) override;
// is called from DoubleClickHdl of the ListBox
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index bd91b53..60e6ea3 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -1849,11 +1849,6 @@ void OSelectionBrowseBox::AddOrder( const OTableFieldDescRef& rInfo, const EOrde
}
}
-void OSelectionBrowseBox::ArrangeControls(sal_uInt16& nX, sal_uInt16 nY)
-{
- EditBrowseBox::ArrangeControls(nX, nY);
-}
-
bool OSelectionBrowseBox::Save()
{
bool bRet = true;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index d11d457..4fad23f 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -192,7 +192,6 @@ namespace dbaui
virtual void MouseButtonUp( const BrowserMouseEvent& rEvt ) override;
virtual void KeyInput( const KeyEvent& rEvt ) override;
virtual void Command(const CommandEvent& rEvt) override;
- virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY) override;
virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol) override;
virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) override;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 499aefb..cf07fa1 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -365,11 +365,6 @@ Reference< XPropertySetInfo > SAL_CALL OQueryController::getPropertySetInfo() th
return xInfo;
}
-void SAL_CALL OQueryController::setFastPropertyValue_NoBroadcast( sal_Int32 i_nHandle, const Any& i_rValue ) throw ( Exception, std::exception )
-{
- OPropertyContainer::setFastPropertyValue_NoBroadcast( i_nHandle, i_rValue );
-}
-
void SAL_CALL OQueryController::getFastPropertyValue( Any& o_rValue, sal_Int32 i_nHandle ) const
{
switch ( i_nHandle )
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 746c16a..7db87b8 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -102,8 +102,6 @@ namespace dbaui
protected:
// OGenericUnoDialog overridables
virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) override;
- virtual void implInitialize( const css::uno::Any& _rValue ) override;
- protected:
using OTextConnectionSettingsDialog_BASE::getFastPropertyValue;
};
@@ -206,11 +204,6 @@ namespace dbaui
return VclPtr<TextConnectionSettingsDialog>::Create( _pParent, *m_pDatasourceItems );
}
- void OTextConnectionSettingsDialog::implInitialize(const Any& _rValue)
- {
- OTextConnectionSettingsDialog_BASE::implInitialize( _rValue );
- }
-
void SAL_CALL OTextConnectionSettingsDialog::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw(Exception, std::exception)
{
PropertyValues::const_iterator pos = m_aPropertyValues.find( _nHandle );
More information about the Libreoffice-commits
mailing list