diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-30 10:29:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-01 10:43:24 +0000 |
| commit | 58aea3f36c14414f95668e229a7350598f6c53a8 (patch) | |
| tree | 70c115dffd44576313cefd49e4164d293895e4bd /dbaccess/source/ui | |
| parent | 3fcbfe10857631212d8b8db9a079bb9692ed78bc (diff) | |
loplugin:unusedmethods
- improvements to the plugin to find more method calls
- improvements to python script to remove more false+
- fix the FORCE_COMPILE_ALL build flag to include code in
the $WORKDIR
Change-Id: I4d6015dcb9b9d60c26f0bcee8abad807177a7836
Reviewed-on: https://gerrit.libreoffice.org/19064
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'dbaccess/source/ui')
49 files changed, 13 insertions, 218 deletions
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index e7f41afbda7e..10d13b8aa43e 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -63,9 +63,6 @@ namespace dbaui virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - inline void enableConnectionURL() { m_pConnectionURL->SetReadOnly(false); } - inline void disableConnectionURL() { m_pConnectionURL->SetReadOnly(); } - /** changes the connection URL. <p>The new URL must be of the type which is currently selected, only the parts which do not affect the type may be changed (compared to the previous URL).</p> diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index cad08bcff1e2..7b221793f111 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -60,16 +60,6 @@ namespace dbaui virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; - inline void enableConnectionURL() { m_pConnectionURL->SetReadOnly(false); } - inline void disableConnectionURL() { m_pConnectionURL->SetReadOnly(); } - - /** changes the connection URL. - <p>The new URL must be of the type which is currently selected, only the parts which do not - affect the type may be changed (compared to the previous URL).</p> - */ - void changeConnectionURL( const OUString& _rNewDSN ); - OUString getConnectionURL( ) const; - protected: OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId); virtual bool checkTestConnection() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 4237fabec45f..58d2a3e2ec5b 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -218,7 +218,6 @@ namespace dbaui static VclPtr<OMySQLIntroPageSetup> CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet ); ConnectionType getMySQLMode(); void SetClickHdl( const Link<OMySQLIntroPageSetup *, void>& rLink ) { maClickHdl = rLink; } - DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*); protected: virtual bool FillItemSet(SfxItemSet* _rSet) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index f00ba18d059e..c487f2c59d10 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -92,8 +92,6 @@ namespace dbaui inline css::uno::Reference< css::uno::XComponentContext > getORB() const { return m_xContext; } - css::uno::Reference< css::sdb::XDatabaseContext > getDatabaseContext() const { return m_xDatabaseContext; } - /** creates a new connection. The caller is responsible to dispose it !!!! */ ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection(); diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 7ce766d8c96f..547e5bcb7b91 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -230,11 +230,6 @@ short ORelationDialog::Execute() return nResult; } -TTableConnectionData::value_type ORelationDialog::getConnectionData() const -{ - return m_pConnData; -} - void ORelationDialog::setValid(bool _bValid) { m_pPB_OK->Enable(_bValid); diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 7aad1f80e3e9..7e5682103130 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -56,7 +56,6 @@ protected: // methods DECL_LINK( ListDblClickHdl, ListBox * ); - DECL_LINK( CloseHdl, PushButton * ); DECL_LINK_TYPED( UserHdl, Button *, void ); void FillUserNames(); diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index accd6c301d95..b6054d413a55 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -91,7 +91,6 @@ namespace dbaui private: void impl_initBooleanSettings(); - DECL_LINK(ClickHdl, Button*); }; // GeneratedValuesPage @@ -127,9 +126,6 @@ namespace dbaui // <method>OGenericAdministrationPage::fillWindows</method> virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - - private: - DECL_LINK( OnCheckBoxClick, CheckBox * ); }; } diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index ef0c43a7dde4..be5ac35d6b7e 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -43,7 +43,6 @@ public: OTableIndex( const OTableIndex& _rSource) : aIndexFileName(_rSource.aIndexFileName) { } explicit OTableIndex( const OUString& rFileName ) : aIndexFileName( rFileName ) { } - void SetIndexFileName( const OUString& rFileName ) { aIndexFileName = rFileName; } OUString GetIndexFileName() const { return aIndexFileName; } }; diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index f8e925ee3f7e..938d30dfcb23 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -69,9 +69,6 @@ ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent ) :OWizardMachine(_pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) ,m_pOutSet(NULL) - ,m_bResetting(false) - ,m_bApplied(false) - ,m_bUIEnabled( true ) { m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,this,this)); m_pImpl->setDataSourceOrName(_aDataSourceName); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 151044a55a95..0b2ff3a3bbe4 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -109,9 +109,6 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent :svt::RoadmapWizard( _pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) , m_pOutSet(NULL) - , m_bResetting(false) - , m_bApplied(false) - , m_bUIEnabled( true ) , m_bIsConnectable( false) , m_sRM_IntroText( ModuleRes( STR_PAGETITLE_INTROPAGE ) ) , m_sRM_dBaseText( ModuleRes( STR_PAGETITLE_DBASE ) ) diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx index 864a36405238..2fc65b4cff6d 100644 --- a/dbaccess/source/ui/inc/ConnectionLine.hxx +++ b/dbaccess/source/ui/inc/ConnectionLine.hxx @@ -56,8 +56,6 @@ namespace dbaui bool RecalcLine(); void Draw( OutputDevice* pOutDev ); bool CheckHit( const Point& rMousePos ) const; - OUString GetSourceFieldName() const { return m_pData->GetSourceFieldName(); } - OUString GetDestFieldName() const { return m_pData->GetDestFieldName(); } bool IsValid() const; diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index b222c01753b3..a330b05b781b 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -57,8 +57,6 @@ namespace dbaui virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException,css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - OJoinTableView* getTableView() const { return m_pTableView; } - void notifyAccessibleEvent( const sal_Int16 _nEventId, const css::uno::Any& _rOldValue, diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index 4a22a2a02994..53ed8ef74c57 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -63,7 +63,6 @@ namespace dbaui protected: // return the Rectangle where I can paint myself virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE; - DECL_LINK_TYPED( SplitHdl, Splitter*, void ); }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_JOINDESIGNVIEW_HXX diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index 833f2f421ca4..f9c490a7a039 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -35,7 +35,6 @@ namespace dbaui class ORelationTableConnectionData : public OTableConnectionData { friend bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableConnectionData& rhs); - friend bool operator!=(const ORelationTableConnectionData& lhs, const ORelationTableConnectionData& rhs) { return !(lhs == rhs); } ::osl::Mutex m_aMutex; @@ -50,7 +49,6 @@ namespace dbaui protected: virtual OConnectionLineDataRef CreateLineDataObj() SAL_OVERRIDE; - virtual OConnectionLineDataRef CreateLineDataObj( const OConnectionLineData& rConnLineData ) SAL_OVERRIDE; ORelationTableConnectionData& operator=( const ORelationTableConnectionData& rConnData ); public: diff --git a/dbaccess/source/ui/inc/RelControliFace.hxx b/dbaccess/source/ui/inc/RelControliFace.hxx index 3fa39ed98d98..bace921f45df 100644 --- a/dbaccess/source/ui/inc/RelControliFace.hxx +++ b/dbaccess/source/ui/inc/RelControliFace.hxx @@ -29,18 +29,11 @@ namespace dbaui public: virtual ~IRelationControlInterface(){} - /** getConnectionData returns the current connection data - @return the current connectiondata - */ - virtual TTableConnectionData::value_type getConnectionData() const = 0; - /** setValid set the valid inside, can be used for OK buttons @param _bValid true when the using control allows an update */ virtual void setValid(bool _bValid) = 0; - virtual css::uno::Reference< css::sdbc::XConnection > getConnection() = 0; - /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists @param _pConnectionData the connection which exists between the new tables */ diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 1d7c81be9df7..db8b2df3a476 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -40,19 +40,15 @@ namespace dbaui // execute a feature virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; - ORelationDesignView* getRelationView() { return static_cast<ORelationDesignView*>( getView() ); } void loadData(); TTableWindowData::value_type existsTable(const OUString& _rComposedTableName,bool _bCase) const; // load the window positions out of the datasource void loadLayoutInformation(); - void loadTableData(const css::uno::Any& _aTable); public: ORelationController(const css::uno::Reference< css::uno::XComponentContext >& _rM); virtual ~ORelationController(); - // temp - void SaveTabWinsPosSize( OJoinTableView::OTableWindowMap* pTabWinList, long nOffsetX, long nOffsetY ); void mergeData(const TTableConnectionData& _aConnectionData); diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 2869d14cddc6..22eac4147ac9 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -63,20 +63,8 @@ namespace dbaui virtual ~ORelationDialog(); virtual void dispose() SAL_OVERRIDE; - virtual css::uno::Reference< css::sdbc::XConnection > getConnection() SAL_OVERRIDE { return m_xConnection; } - virtual short Execute() SAL_OVERRIDE; - /** getTableMap gives access to the table window map - @retrun the table window from the join view - */ - OJoinTableView::OTableWindowMap* getTableMap() const { return m_pTableMap; } - - /** getConnectionData returns the current connection data - @return the current connection data - */ - virtual TTableConnectionData::value_type getConnectionData() const SAL_OVERRIDE; - /** setValid set the valid inside, can be used for OK buttons @param _bValid true when the using control allows an update */ diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index 03ba4018ce8f..ec4532a0335c 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -37,10 +37,6 @@ namespace dbaui { } - void setUpperCase(bool _bUpper=true) - { - m_bOnlyUpperCase = _bUpper; - } void setAllowedChars(const OUString& _rAllowedChars) { m_sAllowedChars = _rAllowedChars; diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx index ab25f3514d7e..ca23565d6789 100644 --- a/dbaccess/source/ui/inc/TableConnectionData.hxx +++ b/dbaccess/source/ui/inc/TableConnectionData.hxx @@ -47,7 +47,6 @@ namespace dbaui void Init(); virtual OConnectionLineDataRef CreateLineDataObj(); - virtual OConnectionLineDataRef CreateLineDataObj( const OConnectionLineData& rConnLineData ); OTableConnectionData& operator=( const OTableConnectionData& rConnData ); public: @@ -95,7 +94,6 @@ namespace dbaui OUString GetConnName() const { return m_aConnName; } - void SetConnName( const OUString& rConnName ){ m_aConnName = rConnName; } /** Update create a new connection @return true if successful diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index b8820b37d3ca..891c98816fa1 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -62,7 +62,6 @@ namespace dbaui bool checkColumns(bool _bNew) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception); // check if we have double column names - OUString createUniqueName(const css::uno::Reference< css::container::XNameAccess>& _rxTables,const OUString& _rDefault); void appendColumns(css::uno::Reference< css::sdbcx::XColumnsSupplier>& _rxColSup, bool _bNew, bool _bKeyColumns = false); void appendPrimaryKey(css::uno::Reference< css::sdbcx::XKeysSupplier>& _rxSup, bool _bNew); void alterColumns(); diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index c6b3f1d71e05..d3f3eb5e469e 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -51,7 +51,6 @@ namespace dbaui virtual void SetCellData( long nRow, sal_uInt16 nColId, const css::uno::Any& _rNewData ) = 0; virtual css::uno::Any GetCellData( long nRow, sal_uInt16 nColId ) = 0; virtual void SetControlText( long nRow, sal_uInt16 nColId, const OUString& rText ) = 0; - virtual OUString GetControlText( long nRow, sal_uInt16 nColId ) = 0; virtual OTableDesignView* GetView() const = 0; diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx index d78f3605cd1d..2c2c778a093e 100644 --- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx +++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx @@ -44,7 +44,6 @@ namespace dbaui virtual void dispose() SAL_OVERRIDE; void SetHelpText( const OUString& rText ); - OUString GetHelpText() const { return m_sHelpText; } virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 9a6fbec1aa73..d1f4ca42ec31 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -37,7 +37,6 @@ namespace dbaui VclPtr<OTableEditorCtrl> m_pEditorCtrl; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); - void ArrangeChildren( long nSplitPos ,Rectangle& rRect); DECL_LINK_TYPED( SplitHdl, Splitter*, void ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index 51ed4e379340..ff555519c3c6 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -92,15 +92,6 @@ namespace dbaui virtual css::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - void notifyAccessibleEvent( - const sal_Int16 _nEventId, - const css::uno::Any& _rOldValue, - const css::uno::Any& _rNewValue - ) - { - NotifyAccessibleEvent(_nEventId,_rOldValue,_rNewValue); - } }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWACCESS_HXX diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index 1a30236067b5..d43d731c038a 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -45,7 +45,6 @@ class ODbDataSourceAdministrationHelper; ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; bool m_bStopExecution; // set when the dialog should not be executed - DECL_LINK( OKClickHdl, OKButton* ); SfxItemSet* m_pOutSet; public: diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index b5db8375115a..143f1252b608 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -331,7 +331,6 @@ namespace dbaui Wizard_Button_Style GetPressedButton() const { return m_ePressed; } void EnableButton(Wizard_Button_Style eStyle, bool bEnable); void AddWizardPage(OWizardPage* pPage); // delete page from OCopyTableWizard - void RemoveWizardPage(OWizardPage* pPage); // Page goes again to user void CheckButtons(); // checks which button can be disabled, enabled // returns a vector where the position of a column and if the column is in the selection @@ -370,7 +369,6 @@ namespace dbaui */ OUString getPrimaryKeyName() const { return m_aKeyName; } - TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; } const OTypeInfoMap& getTypeInfo() const { return m_aTypeInfo; } TOTypeInfoSP getDestTypeInfo(sal_Int32 _nPos) const { return m_aDestTypeInfoIndex[_nPos]->second; } diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 0903fbff2b8a..098c69ac66ec 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -83,7 +83,6 @@ namespace dbaui virtual ~OAddTableDlg(); virtual void dispose() SAL_OVERRIDE; - void DetermineAddTable() { m_pAddButton->Enable( impl_isAddAllowed() ); } void Update(); static OUString getDialogTitleForContext( diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx index 68dc816753e3..d269bae7a7b5 100644 --- a/dbaccess/source/ui/inc/charsets.hxx +++ b/dbaccess/source/ui/inc/charsets.hxx @@ -54,8 +54,6 @@ namespace dbaui const_iterator begin() const; /// get access to the (last + 1st) element of the charset collection const_iterator end() const; - // size of the map - sal_Int32 size() const { return OCharsetDisplay_Base::size(); } protected: virtual bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const SAL_OVERRIDE; @@ -75,7 +73,6 @@ namespace dbaui public: CharsetDisplayDerefHelper(const CharsetDisplayDerefHelper& _rSource); - rtl_TextEncoding getEncoding() const { return CharsetDisplayDerefHelper_Base::getEncoding(); } OUString getIanaName() const { return CharsetDisplayDerefHelper_Base::getIanaName(); } OUString getDisplayName() const { return m_sDisplayName; } diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 6f5af9e5fe2b..f306650acfb2 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -55,16 +55,12 @@ class ODbDataSourceAdministrationHelper; class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient { private: - OModuleClient m_aModuleClient; + OModuleClient m_aModuleClient; ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pOutSet; ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance - OUString m_eType; - - bool m_bResetting : 1; /// sal_True while we're resetting the pages - bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing - bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> + OUString m_eType; public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed @@ -101,11 +97,6 @@ protected: virtual bool onFinish() SAL_OVERRIDE; protected: - inline void disabledUI() { m_bUIEnabled = false; } - - /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. - void implSelectDatasource(const OUString& _rRegisteredName); - void resetPages(const css::uno::Reference< css::beans::XPropertySet >& _rxDatasource); enum ApplyResult { @@ -113,9 +104,6 @@ protected: AR_LEAVE_UNCHANGED, // no changes were made AR_KEEP // don't leave the page (e.g. because an error occurred) }; - /** apply all changes made - */ - ApplyResult implApplyChanges(); private: DECL_LINK_TYPED(OnTypeSelected, OGeneralPage&, void); diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 2fea8fb54c16..058e79b274fa 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -60,15 +60,12 @@ class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, { private: - OModuleClient m_aModuleClient; + OModuleClient m_aModuleClient; ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pOutSet; - OUString m_sURL; - OUString m_sOldURL; - bool m_bResetting : 1; /// sal_True while we're resetting the pages - bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing - bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> - bool m_bIsConnectable : 1; + OUString m_sURL; + OUString m_sOldURL; + bool m_bIsConnectable : 1; OUString m_sRM_IntroText; OUString m_sRM_dBaseText; OUString m_sRM_TextText; @@ -135,10 +132,6 @@ protected: virtual bool onFinish() SAL_OVERRIDE; protected: - inline void disabledUI() { m_bUIEnabled = false; } - - /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. - void implSelectDatasource(const OUString& _rRegisteredName); void resetPages(const css::uno::Reference< css::beans::XPropertySet >& _rxDatasource); enum ApplyResult diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx index 3366a77f27f1..baa39afd3e4e 100644 --- a/dbaccess/source/ui/inc/indexcollection.hxx +++ b/dbaccess/source/ui/inc/indexcollection.hxx @@ -80,9 +80,6 @@ namespace dbaui // detach from the container void detach(); - // number of contained indexes - sal_Int32 size() const { return m_aIndexes.size(); } - /// drop an index, and remove it from the collection bool drop(const Indexes::iterator& _rPos); /// simply drop the index described by the name, but don't remove the descriptor from the collection diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 454f1f8c97c3..5121ac52080e 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -168,10 +168,6 @@ namespace dbaui bool implDropIndex(SvTreeListEntry* _pEntry, bool _bRemoveFromCollection); bool implCheckPlausibility(const Indexes::const_iterator& _rPos); - - /** checks if the controls have to be replaced and moved. - */ - void checkControls(); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index 58bb7c4113d7..bf73aa551cda 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -92,8 +92,6 @@ namespace dbaui protected: void Construct(); - ::connectivity::OSQLParseNode* implPredicateTree(OUString& _rErrorMessage, const OUString& _rStatement, const css::uno::Reference< css::beans::XPropertySet > & _rxField); - private: DECL_LINK_TYPED(OnVisitedTimeout, Timer*, void); DECL_LINK(OnValueModified, Control*); diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index cdf2ac3d71f0..cf9c2aefc39d 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -70,10 +70,10 @@ namespace dbaui /// if we're editing an existing view, this is non-NULL css::uno::Reference< css::sdbcx::XAlterView > m_xAlterView; - OUString m_sStatement; // contains the current sql statement - OUString m_sUpdateCatalogName; // catalog for update data - OUString m_sUpdateSchemaName; // schema for update data - OUString m_sUpdateTableName; // table for update data + OUString m_sStatement; // contains the current sql statement + OUString m_sUpdateCatalogName; // catalog for update data + OUString m_sUpdateSchemaName; // schema for update data + OUString m_sUpdateTableName; // table for update data mutable OUString m_sName; // name of the query @@ -82,12 +82,9 @@ namespace dbaui sal_Int32 m_nVisibleRows; // which rows the selection browse should show sal_Int32 m_nSplitPos; // the position of the splitter sal_Int32 m_nCommandType; // the type of the object we're designing - bool m_bGraphicalDesign; // are we in the graphical design mode (sal_True) or in the text design (sal_False)? - bool m_bDistinct; // true when you want "select distinct" otherwise false - bool m_bViewAlias; // show the alias row in the design view - bool m_bViewTable; // show the table row in the design view - bool m_bViewFunction; // show the function row in the design view - bool m_bEscapeProcessing;// is true when we shouldn't parse the statement + bool m_bGraphicalDesign; // are we in the graphical design mode (sal_True) or in the text design (sal_False)? + bool m_bDistinct; // true when you want "select distinct" otherwise false + bool m_bEscapeProcessing;// is true when we shouldn't parse the statement /** returns the container of queries, views, or command definitions, depending on what object type @@ -114,8 +111,6 @@ namespace dbaui void loadViewSettings( const ::comphelper::NamedValueCollection& o_rViewSettings ); OUString translateStatement( bool _bFireStatementChange = true ); - OUString getDefaultName() const; - void execute_QueryPropDlg(); protected: diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 6d5b73b84c9f..2fb4e710abbe 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -429,11 +429,6 @@ namespace dbaui void transferChangedControlProperty(const OUString& _rProperty, const css::uno::Any& _rNewValue); - css::uno::Reference< css::sdbc::XConnection > connectWithStatus( - const OUString& _rDataSourceName, - void* _pTreeListUserData // in reality a DBTreeListUserData*, but we do not know this class here... - ); - // checks whether the given tree entry denotes a data source bool impl_isDataSourceEntry( SvTreeListEntry* _pEntry ) const; diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx index ba4de09285fd..cdfadf7b87b4 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx @@ -70,11 +70,6 @@ OConnectionLineDataRef OQueryTableConnectionData::CreateLineDataObj() return new OConnectionLineData(); } -OConnectionLineDataRef OQueryTableConnectionData::CreateLineDataObj( const OConnectionLineData& rConnLineData ) -{ - return new OConnectionLineData( rConnLineData ); -} - void OQueryTableConnectionData::CopyFrom(const OTableConnectionData& rSource) { // same as in base class, use of (non-virtual) operator= diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx index c511649bf2f4..9561f1dfd36e 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx @@ -39,7 +39,6 @@ namespace dbaui protected: // for creation and duplication of lines of own type virtual OConnectionLineDataRef CreateLineDataObj() SAL_OVERRIDE; - virtual OConnectionLineDataRef CreateLineDataObj( const OConnectionLineData& rConnLineData ) SAL_OVERRIDE; OQueryTableConnectionData& operator=( const OQueryTableConnectionData& rConnData ); public: @@ -64,7 +63,6 @@ namespace dbaui sal_Int32 GetFieldIndex(EConnectionSide nWhich) const { return nWhich==JTCS_TO ? m_nDestEntryIndex : m_nFromEntryIndex; } void SetFieldIndex(EConnectionSide nWhich, sal_Int32 nVal) { if (nWhich==JTCS_TO) m_nDestEntryIndex=nVal; else m_nFromEntryIndex=nVal; } - ETableFieldType GetFieldType(EConnectionSide nWhich) const { return nWhich==JTCS_TO ? m_eDestType : m_eFromType; } void SetFieldType(EConnectionSide nWhich, ETableFieldType eType) { if (nWhich==JTCS_TO) m_eDestType=eType; else m_eFromType=eType; } void InitFromDrag(const OTableFieldDescRef& rDragLeft, const OTableFieldDescRef& rDragRight); diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx index c480b4be4bd1..fd30978d2af2 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx @@ -45,8 +45,6 @@ namespace dbaui // late Constructor, the base class CREATES Listbox on first call virtual bool Init() SAL_OVERRIDE; - inline sal_Int32 GetAliasNum() const { return m_nAliasNum; } - bool ExistsField(const OUString& strFieldName, OTableFieldDescRef& rInfo); bool ExistsAVisitedConn() const; diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx index af22a64063d2..aea22ac3dec8 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx @@ -51,16 +51,9 @@ namespace dbaui void SetTabWin(OQueryTableWindow* pTW) { m_pTabWin = pTW; } // now SetOwnership should be invoked - // access to the managed connections - sal_uInt16 ConnCount() { return (sal_uInt16)m_vTableConnection.size(); } - ::std::vector<VclPtr<OTableConnection> >& GetTabConnList() { return m_vTableConnection; } void InsertConnection( OTableConnection* pConnection ) { m_vTableConnection.push_back(pConnection); } - void RemoveConnection( OTableConnection* pConnection ) - { - m_vTableConnection.erase(::std::remove(m_vTableConnection.begin(),m_vTableConnection.end(),pConnection),m_vTableConnection.end()); - } }; } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 91164af853ff..a6240cbe6b71 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -55,7 +55,6 @@ using namespace ::com::sun::star::accessibility; #define DEFAULT_QUERY_COLS 20 #define DEFAULT_SIZE GetTextWidth("0") * 30 -#define CHECKBOX_SIZE 10 #define HANDLE_ID 0 #define HANDLE_COLUMN_WITDH 70 #define SORT_COLUMN_NONE 0xFFFFFFFF @@ -2317,16 +2316,6 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, sal_uInt16 nColId, con static_cast<OQueryController&>(getDesignView()->getController()).setModified( sal_True ); } -sal_uInt32 OSelectionBrowseBox::GetTotalCellWidth(long nRow, sal_uInt16 nColId) const -{ - - long nRowId = GetRealRow(nRow); - if (nRowId == BROW_VIS_ROW) - return CHECKBOX_SIZE; - else - return GetDataWindow().GetTextWidth(GetCellText(nRowId, nColId)); -} - void OSelectionBrowseBox::ColumnResized(sal_uInt16 nColId) { if (static_cast<OQueryController&>(getDesignView()->getController()).isReadOnly()) diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 3999f592633a..fe825dcb4213 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -201,7 +201,6 @@ namespace dbaui virtual void CellModified() SAL_OVERRIDE; virtual bool SaveModified() SAL_OVERRIDE; virtual void Init() SAL_OVERRIDE; - sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) const; virtual void ColumnResized( sal_uInt16 nColId ) SAL_OVERRIDE; virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx index 43fc4eed8880..9278e271033d 100644 --- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx @@ -136,11 +136,6 @@ OConnectionLineDataRef OTableConnectionData::CreateLineDataObj() return new OConnectionLineData(); } -OConnectionLineDataRef OTableConnectionData::CreateLineDataObj( const OConnectionLineData& rConnLineData ) -{ - return new OConnectionLineData( rConnLineData ); -} - OTableConnectionData* OTableConnectionData::NewInstance() const { return new OTableConnectionData(); diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 9a21da5e71ad..7cca1a54d88b 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -337,9 +337,6 @@ OQueryController::OQueryController(const Reference< XComponentContext >& _rM) ,m_nCommandType( CommandType::QUERY ) ,m_bGraphicalDesign(false) ,m_bDistinct(false) - ,m_bViewAlias(false) - ,m_bViewTable(false) - ,m_bViewFunction(false) ,m_bEscapeProcessing(true) { InvalidateAll(); diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index ebb3188f6c7d..84c901cbd9a0 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -277,11 +277,6 @@ IMPL_LINK_NOARG_TYPED( DlgQryJoin, NaturalToggleHdl, CheckBox&, void ) } } -TTableConnectionData::value_type DlgQryJoin::getConnectionData() const -{ - return m_pConnData; -} - void DlgQryJoin::setValid(bool _bValid) { m_pPB_OK->Enable(_bValid || eJoinType == CROSS_JOIN ); diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index feca1afc0ed9..eeb8fea63328 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -72,18 +72,11 @@ namespace dbaui virtual void dispose() SAL_OVERRIDE; EJoinType GetJoinType() const { return eJoinType; }; - /** getConnectionData returns the current connection data - @return the current connectiondata - */ - virtual TTableConnectionData::value_type getConnectionData() const SAL_OVERRIDE; - /** setValid set the valid inside, can be used for OK buttons @param _bValid true when the using control allows an update */ virtual void setValid(bool _bValid) SAL_OVERRIDE; - virtual css::uno::Reference< css::sdbc::XConnection > getConnection() SAL_OVERRIDE { return m_xConnection; } - /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists @param _pConnectionData the connection which exists between the new tables */ diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index 25109418e267..9cc424a45826 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -196,11 +196,6 @@ OConnectionLineDataRef ORelationTableConnectionData::CreateLineDataObj() return new OConnectionLineData(); } -OConnectionLineDataRef ORelationTableConnectionData::CreateLineDataObj( const OConnectionLineData& rConnLineData ) -{ - return new OConnectionLineData( rConnLineData ); -} - void ORelationTableConnectionData::CopyFrom(const OTableConnectionData& rSource) { // retract to the (non-virtual) operator= like in the base class diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 6744812fe4d5..90e73412f0fe 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -877,25 +877,6 @@ void OTableEditorCtrl::InsertNewRows( long nRow ) InvalidateFeatures(); } -OUString OTableEditorCtrl::GetControlText( long nRow, sal_uInt16 nColId ) -{ - // Read the Browser Controls - if( nColId < FIELD_FIRST_VIRTUAL_COLUMN ) - { - GoToRow( nRow ); - GoToColumnId( nColId ); - CellControllerRef xController = Controller(); - if(xController.Is()) - return xController->GetWindow().GetText(); - else - return GetCellText(nRow,nColId); - } - - // Read the Controls on the Tabpage - else - return pDescrWin->GetControlText( nColId ); -} - void OTableEditorCtrl::SetControlText( long nRow, sal_uInt16 nColId, const OUString& rText ) { // Set the Browser Controls diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 20f3614bf99e..c7154600c34e 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -118,8 +118,6 @@ namespace dbaui void SetPrimaryKey( bool bSet ); bool IsPrimaryKey(); - DECL_LINK(ControlPreNotifyHdl, NotifyEvent*); - public: explicit OTableEditorCtrl(vcl::Window* pParentWin); virtual ~OTableEditorCtrl(); @@ -143,7 +141,6 @@ namespace dbaui virtual void SetCellData( long nRow, sal_uInt16 nColId, const css::uno::Any& _rSaveData ) SAL_OVERRIDE; virtual css::uno::Any GetCellData( long nRow, sal_uInt16 nColId ) SAL_OVERRIDE; virtual void SetControlText( long nRow, sal_uInt16 nColId, const OUString& rText ) SAL_OVERRIDE; - virtual OUString GetControlText( long nRow, sal_uInt16 nColId ) SAL_OVERRIDE; virtual OTableDesignView* GetView() const SAL_OVERRIDE; @@ -175,7 +172,6 @@ namespace dbaui virtual void paste() SAL_OVERRIDE; private: - DECL_LINK( StartIndexing, void* ); DECL_LINK_TYPED( DelayedCut, void*, void ); DECL_LINK_TYPED( DelayedPaste, void*, void ); DECL_LINK_TYPED( DelayedDelete, void*, void ); diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index e300a483500c..d52d3f021512 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -70,8 +70,6 @@ namespace dbaui void SetControlText( sal_uInt16 nControlId, const OUString& rText ) { m_pGenPage->SetControlText(nControlId,rText); } - OUString GetControlText( sal_uInt16 nControlId ) - { return m_pGenPage->GetControlText(nControlId); } // short GetFormatCategory(OFieldDescription* pFieldDescr) { return m_pGenPage ? m_pGenPage->GetFormatCategory(pFieldDescr) : -1; } // delivers a CAT_xxx (CAT_NUMBER, CAT_DATE ...) value to a Format set in the field |