diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-09-04 16:08:36 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-09-05 08:27:23 +0200 |
commit | 6c9917c7a74e1c14f1c60ad40b96470b6ef08936 (patch) | |
tree | 07beaf7a8207e34acc642ae2d91e3facd7080ccc /dbaccess | |
parent | 51fa45c8b8ee2ff37beef9639dc1ce5ed1e38e8f (diff) |
loplugin:constmethod in dbaccess
Change-Id: I3bb4784e1a2d828eca30f255a9c9bb4248309b81
Reviewed-on: https://gerrit.libreoffice.org/78603
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
49 files changed, 98 insertions, 98 deletions
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index a7446ea3439e..81b151bd15d8 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -332,7 +332,7 @@ namespace dbaccess bool isModification( const GrantNotifierAccess& ) { return isModification(); } bool isModified( const GrantNotifierAccess& ) { return isModified(); } bool isNew( const GrantNotifierAccess& ) { return isNew(); } - bool isInsertRow() { return m_bIsInsertRow; } // isNew() || isModified(); } + bool isInsertRow() const { return m_bIsInsertRow; } // isNew() || isModified(); } void fireProperty( sal_Int32 _nProperty, bool _bNew, bool _bOld, const GrantNotifierAccess& ) { fireProperty( _nProperty, _bNew, _bOld ); diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index c93067ab2944..a3a1de4df10a 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -673,12 +673,12 @@ bool ORowSetCache::next( ) } -bool ORowSetCache::isFirst( ) +bool ORowSetCache::isFirst( ) const { return m_nPosition == 1; // ask resultset for } -bool ORowSetCache::isLast( ) +bool ORowSetCache::isLast( ) const { return m_nPosition == m_nRowCount; } @@ -1123,7 +1123,7 @@ bool ORowSetCache::last( ) return bRet; } -sal_Int32 ORowSetCache::getRow( ) +sal_Int32 ORowSetCache::getRow( ) const { return (isBeforeFirst() || isAfterLast()) ? 0 : m_nPosition; } diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index 7d9adedcd35b..e727c72a0d40 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -146,7 +146,7 @@ namespace dbaccess void deregisterOldRow(const TORowSetOldRowHelperRef& _rRow); // css::sdbc::XResultSetMetaDataSupplier - const css::uno::Reference< css::sdbc::XResultSetMetaData >& getMetaData( ) { return m_xMetaData;} + const css::uno::Reference< css::sdbc::XResultSetMetaData >& getMetaData( ) const { return m_xMetaData;} // css::sdbcx::XRowLocate css::uno::Any getBookmark( ); @@ -170,13 +170,13 @@ namespace dbaccess bool next( ); bool isBeforeFirst( ) const { return m_bBeforeFirst;} bool isAfterLast( ) const { return m_bAfterLast;} - bool isFirst( ); - bool isLast( ); + bool isFirst( ) const; + bool isLast( ) const; void beforeFirst( ); void afterLast( ); bool first( ); bool last( ); - sal_Int32 getRow( ); + sal_Int32 getRow( ) const; bool absolute( sal_Int32 row ); bool relative( sal_Int32 rows ); bool previous( ); diff --git a/dbaccess/source/filter/hsqldb/parseschema.hxx b/dbaccess/source/filter/hsqldb/parseschema.hxx index 0f69262a4227..f5fd5259603f 100644 --- a/dbaccess/source/filter/hsqldb/parseschema.hxx +++ b/dbaccess/source/filter/hsqldb/parseschema.hxx @@ -49,12 +49,12 @@ public: /** * @return A vector of schema definition SQL strings in Firebird dialect. */ - const SqlStatementVector& getCreateStatements() { return m_sCreateStatements; } + const SqlStatementVector& getCreateStatements() const { return m_sCreateStatements; } /** * @return A vector of alter SQL strings in Firebird dialect. */ - const SqlStatementVector& getAlterStatements() { return m_sAlterStatements; } + const SqlStatementVector& getAlterStatements() const { return m_sAlterStatements; } /** * Returns the column types of a table. It should not be called before diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 6f050db476d8..77638fa3f798 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -500,7 +500,7 @@ sal_Int32 OAppDetailPageHelper::getSelectionCount() return nCount; } -sal_Int32 OAppDetailPageHelper::getElementCount() +sal_Int32 OAppDetailPageHelper::getElementCount() const { sal_Int32 nCount = 0; int nPos = getVisibleControlIndex(); @@ -933,7 +933,7 @@ void OAppDetailPageHelper::Resize() } -bool OAppDetailPageHelper::isPreviewEnabled() +bool OAppDetailPageHelper::isPreviewEnabled() const { return m_ePreviewMode != E_PREVIEWNONE; } diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 43cb85d0ba3b..e237a4413f08 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -247,7 +247,7 @@ namespace dbaui sal_Int32 getSelectionCount(); /// returns the count of entries - sal_Int32 getElementCount(); + sal_Int32 getElementCount() const; /** returns if an entry is a leaf @param _pEntry @@ -311,10 +311,10 @@ namespace dbaui ,const OUString& _rName ); /// returns the preview mode - PreviewMode getPreviewMode() { return m_ePreviewMode;} + PreviewMode getPreviewMode() const { return m_ePreviewMode;} /// <TRUE/> if the preview is enabled - bool isPreviewEnabled(); + bool isPreviewEnabled() const; /** switches to the given preview mode @param _eMode diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index da1823ba8b4c..b997c8e301ad 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -777,7 +777,7 @@ sal_Int32 OApplicationDetailView::getSelectionCount() return m_pControlHelper->getSelectionCount(); } -sal_Int32 OApplicationDetailView::getElementCount() +sal_Int32 OApplicationDetailView::getElementCount() const { return m_pControlHelper->getElementCount(); } @@ -842,12 +842,12 @@ void OApplicationDetailView::elementReplaced(ElementType _eType m_pControlHelper->elementReplaced( _eType, _rOldName, _rNewName ); } -PreviewMode OApplicationDetailView::getPreviewMode() +PreviewMode OApplicationDetailView::getPreviewMode() const { return m_pControlHelper->getPreviewMode(); } -bool OApplicationDetailView::isPreviewEnabled() +bool OApplicationDetailView::isPreviewEnabled() const { return m_pControlHelper->isPreviewEnabled(); } diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index f03ce5d9f859..1f7866e7b9ef 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -246,7 +246,7 @@ namespace dbaui void clearPages(bool _bTaskAlso = true); /// returns the count of entries - sal_Int32 getElementCount(); + sal_Int32 getElementCount() const; /// returns the count of selected entries sal_Int32 getSelectionCount(); @@ -319,10 +319,10 @@ namespace dbaui ,const OUString& _rName ); /// returns the preview mode - PreviewMode getPreviewMode(); + PreviewMode getPreviewMode() const; /// <TRUE/> if the preview is enabled - bool isPreviewEnabled(); + bool isPreviewEnabled() const; /** switches to the given preview mode @param _eMode diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 6c0b122e3172..00cbb0e4ef65 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -368,13 +368,13 @@ ElementType OApplicationView::getElementType() const return getDetailView()->HasChildPathFocus() ? getDetailView()->getElementType() : getPanel()->getElementType(); } -sal_Int32 OApplicationView::getSelectionCount() +sal_Int32 OApplicationView::getSelectionCount() const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->getSelectionCount(); } -sal_Int32 OApplicationView::getElementCount() +sal_Int32 OApplicationView::getElementCount() const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->getElementCount(); @@ -444,13 +444,13 @@ SvTreeListEntry* OApplicationView::getEntry( const Point& _aPosPixel ) const return getDetailView()->getEntry(_aPosPixel); } -PreviewMode OApplicationView::getPreviewMode() +PreviewMode OApplicationView::getPreviewMode() const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->getPreviewMode(); } -bool OApplicationView::isPreviewEnabled() +bool OApplicationView::isPreviewEnabled() const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->isPreviewEnabled(); diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index 3cf3e986365b..dd7a76f9e30f 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -174,10 +174,10 @@ namespace dbaui ElementType getElementType() const; /// returns the count of entries - sal_Int32 getElementCount(); + sal_Int32 getElementCount() const; /// returns the count of selected entries - sal_Int32 getSelectionCount(); + sal_Int32 getSelectionCount() const; /** clears the detail page and the selection on the left side. The task window will also be cleared. @@ -258,10 +258,10 @@ namespace dbaui void selectContainer(ElementType _eType); /// returns the preview mode - PreviewMode getPreviewMode(); + PreviewMode getPreviewMode() const; /// <TRUE/> if the preview is enabled - bool isPreviewEnabled(); + bool isPreviewEnabled() const; /** switches to the given preview mode @param _eMode diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index b972ead4cd73..c2dcbbce590c 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2550,7 +2550,7 @@ bool SbaXDataBrowserController::isValidCursor() const return bIsValid; } -sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition() +sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition() const { Reference< css::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); sal_Int16 nViewPos = -1; diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 1c45ddc3c97d..8fc08488620d 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1527,7 +1527,7 @@ void OFieldDescControl::LoseFocus() TabPage::LoseFocus(); } -bool OFieldDescControl::isCopyAllowed() +bool OFieldDescControl::isCopyAllowed() const { bool bAllowed = (m_pActFocusWindow != nullptr) && (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || @@ -1539,7 +1539,7 @@ bool OFieldDescControl::isCopyAllowed() return bAllowed; } -bool OFieldDescControl::isCutAllowed() +bool OFieldDescControl::isCutAllowed() const { bool bAllowed = (m_pActFocusWindow != nullptr) && (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || @@ -1550,7 +1550,7 @@ bool OFieldDescControl::isCutAllowed() return bAllowed; } -bool OFieldDescControl::isPasteAllowed() +bool OFieldDescControl::isPasteAllowed() const { bool bAllowed = (m_pActFocusWindow != nullptr) && (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index be884d43a15c..d591ececdf30 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -457,7 +457,7 @@ void TableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConne m_xTreeView->make_sorted(); } -bool TableTreeListBox::isWildcardChecked(weld::TreeIter& rEntry) +bool TableTreeListBox::isWildcardChecked(const weld::TreeIter& rEntry) { return m_xTreeView->get_text_emphasis(rEntry, m_nTextColumn); } @@ -902,7 +902,7 @@ void OTableTreeListBox::removedTable( const OUString& _rName ) } } -std::unique_ptr<weld::TreeIter> TableTreeListBox::GetEntryPosByName(const OUString& aName, weld::TreeIter* pStart, const IEntryFilter* _pFilter) const +std::unique_ptr<weld::TreeIter> TableTreeListBox::GetEntryPosByName(const OUString& aName, const weld::TreeIter* pStart, const IEntryFilter* _pFilter) const { auto xEntry(m_xTreeView->make_iterator(pStart)); if (!pStart && !m_xTreeView->get_iter_first(*xEntry)) diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index b6680a8a061f..5db44f69bfb8 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -283,7 +283,7 @@ using namespace ::com::sun::star; return true; } - OMySQLIntroPageSetup::ConnectionType OMySQLIntroPageSetup::getMySQLMode() + OMySQLIntroPageSetup::ConnectionType OMySQLIntroPageSetup::getMySQLMode() const { if (m_xJDBCDatabase->get_active()) return VIA_JDBC; @@ -758,17 +758,17 @@ using namespace ::com::sun::star; { } - bool OFinalDBPageSetup::IsDatabaseDocumentToBeRegistered() + bool OFinalDBPageSetup::IsDatabaseDocumentToBeRegistered() const { return m_xRBRegisterDataSource->get_active() && m_xRBRegisterDataSource->get_sensitive(); } - bool OFinalDBPageSetup::IsDatabaseDocumentToBeOpened() + bool OFinalDBPageSetup::IsDatabaseDocumentToBeOpened() const { return m_xCBOpenAfterwards->get_active() && m_xCBOpenAfterwards->get_sensitive(); } - bool OFinalDBPageSetup::IsTableWizardToBeStarted() + bool OFinalDBPageSetup::IsTableWizardToBeStarted() const { return m_xCBStartTableWizard->get_active() && m_xCBStartTableWizard->get_sensitive(); } diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index eb34ff7b6368..4cee46b500af 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -204,7 +204,7 @@ namespace dbaui virtual ~OMySQLIntroPageSetup() override; static VclPtr<OMySQLIntroPageSetup> CreateMySQLIntroTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet); - ConnectionType getMySQLMode(); + ConnectionType getMySQLMode() const; void SetClickHdl( const Link<OMySQLIntroPageSetup *, void>& rLink ) { maClickHdl = rLink; } protected: @@ -252,9 +252,9 @@ namespace dbaui OFinalDBPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs); virtual ~OFinalDBPageSetup() override; - bool IsDatabaseDocumentToBeRegistered(); - bool IsDatabaseDocumentToBeOpened(); - bool IsTableWizardToBeStarted(); + bool IsDatabaseDocumentToBeRegistered() const; + bool IsDatabaseDocumentToBeOpened() const; + bool IsTableWizardToBeStarted() const; void enableTableWizardCheckBox( bool _bSupportsTableCreation); DECL_LINK(OnOpenSelected, weld::ToggleButton&, void); diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index a35aa6f6c780..12198011a270 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -357,7 +357,7 @@ namespace dbaui } } - OUString OTextConnectionHelper::GetExtension() + OUString OTextConnectionHelper::GetExtension() const { OUString sExtension; if (m_xAccessTextFiles->get_active()) diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index e8db965e5b2d..6c69b24874c8 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -86,7 +86,7 @@ namespace dbaui void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList); void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList); void SetClickHandler(const Link<OTextConnectionHelper*, void>& _rHandler) { m_aGetExtensionHandler = _rHandler; } - OUString GetExtension(); + OUString GetExtension() const; bool FillItemSet( SfxItemSet& rSet, const bool bChangedSomething ); bool prepareLeave(); }; diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 065fd4c0096a..e6cd0dc6d078 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -276,7 +276,7 @@ IMPL_LINK_NOARG( OUserAdmin, ListDblClickHdl, ListBox&, void ) m_TableCtrl->ActivateCell(m_TableCtrl->GetCurRow(),m_TableCtrl->GetCurColumnId()); } -OUString OUserAdmin::GetUser() +OUString OUserAdmin::GetUser() const { return m_pUSER->GetSelectedEntry(); } diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 41eae665aa80..f0d105646539 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -62,7 +62,7 @@ public: virtual ~OUserAdmin() override; virtual void dispose() override; - OUString GetUser(); + OUString GetUser() const; // subclasses must override this, but it isn't pure virtual virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index aca0710c5fc7..2c10d235cdcc 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -57,7 +57,7 @@ void DlgSize::SetValue( sal_Int32 nVal ) m_xMF_VALUE->set_value(nVal, FieldUnit::CM ); } -sal_Int32 DlgSize::GetValue() +sal_Int32 DlgSize::GetValue() const { if (m_xCB_STANDARD->get_active()) return -1; diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 0e6c78bf1e1a..99f12fe8f93a 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -459,7 +459,7 @@ namespace dbaui return aTableFilter; } - std::unique_ptr<weld::TreeIter> OTableSubscriptionPage::implNextSibling(weld::TreeIter* pEntry) const + std::unique_ptr<weld::TreeIter> OTableSubscriptionPage::implNextSibling(const weld::TreeIter* pEntry) const { std::unique_ptr<weld::TreeIter> xReturn; if (pEntry) diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index ff21538554b3..6103e4915915 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -66,7 +66,7 @@ namespace dbaui void implCheckTables(const css::uno::Sequence< OUString >& _rTables); /// returns the next sibling, if not available, the next sibling of the parent, a.s.o. - std::unique_ptr<weld::TreeIter> implNextSibling(weld::TreeIter* pEntry) const; + std::unique_ptr<weld::TreeIter> implNextSibling(const weld::TreeIter* pEntry) const; /** return the current selection in <member>m_aTablesList</member> */ diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx index fffbcc79b02c..89dd1dff21e0 100644 --- a/dbaccess/source/ui/inc/ConnectionLine.hxx +++ b/dbaccess/source/ui/inc/ConnectionLine.hxx @@ -52,7 +52,7 @@ namespace dbaui OConnectionLine& operator=( const OConnectionLine& rLine ); - tools::Rectangle GetBoundingRect(); + tools::Rectangle GetBoundingRect() const; bool RecalcLine(); void Draw( OutputDevice* pOutDev ); bool CheckHit( const Point& rMousePos ) const; diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 6a19023468fe..e24670609ef9 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -186,9 +186,9 @@ namespace dbaui // when resize is called void CheckScrollBars(); - bool isCutAllowed(); - bool isCopyAllowed(); - bool isPasteAllowed(); + bool isCutAllowed() const; + bool isCopyAllowed() const; + bool isPasteAllowed() const; void cut(); void copy(); diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 16723812dd49..c1b592074728 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -164,7 +164,7 @@ namespace dbaui void addConnection(OTableConnection* _pConnection,bool _bAddData = true); bool ScrollPane( long nDelta, bool bHoriz, bool bPaintScrollBars ); - sal_uLong GetTabWinCount(); + sal_uLong GetTabWinCount() const; const Point& GetScrollOffset() const { return m_aScrollOffset; } OJoinDesignView* getDesignView() const { return m_pView; } diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index 661f2bb722a1..fefd6cc9d311 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -77,9 +77,9 @@ namespace dbaui virtual ~OQueryDesignView() override; virtual void dispose() override; - bool isCutAllowed(); - bool isPasteAllowed(); - bool isCopyAllowed(); + bool isCutAllowed() const; + bool isPasteAllowed() const; + bool isCopyAllowed() const; void copy(); void cut(); void paste(); diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index 0179c4d76ae6..c41a7cea7bc9 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -35,7 +35,7 @@ namespace dbaui virtual void GetFocus() override; - bool isCutAllowed(); + bool isCutAllowed() const; void copy(); void cut(); void paste(); @@ -43,7 +43,7 @@ namespace dbaui void clear(); // set the statement for representation void setStatement(const OUString& _rsStatement); - OUString getStatement(); + OUString getStatement() const; // allow access to our edit OSqlEdit* getSqlEdit() const { return m_pEdit; } diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx index 23d207c2f227..85862c736ba0 100644 --- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx +++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx @@ -43,9 +43,9 @@ namespace dbaui OQueryViewSwitch(OQueryContainerWindow* pParent, OQueryController& _rController,const css::uno::Reference< css::uno::XComponentContext >& ); ~OQueryViewSwitch(); - bool isCutAllowed(); - bool isPasteAllowed(); - bool isCopyAllowed(); + bool isCutAllowed() const; + bool isPasteAllowed() const; + bool isCopyAllowed() const; void copy(); void cut(); void paste(); diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index e6ab7c5ee3a8..81963c622e7f 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -85,7 +85,7 @@ namespace dbaui public: OTableController(const css::uno::Reference< css::uno::XComponentContext >& _rM); - const css::uno::Reference< css::beans::XPropertySet >& getTable() { return m_xTable;} + const css::uno::Reference< css::beans::XPropertySet >& getTable() const { return m_xTable;} bool isAddAllowed() const; bool isDropAllowed() const; diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index 46d356531a16..8aab2d345655 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -50,7 +50,7 @@ namespace dbaui virtual OTableDesignView* GetView() const = 0; - sal_uInt16 GetCurUndoActId(){ return m_nCurUndoActId; } + sal_uInt16 GetCurUndoActId() const { return m_nCurUndoActId; } // IClipboardTest virtual void cut() override; diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 879ab4beae8e..e356a5a265f7 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -151,7 +151,7 @@ namespace dbaui OUString const & GetComposedName() const { return m_pData->GetComposedName(); } const VclPtr<OTableWindowListBox>& GetListBox() const { return m_xListBox; } const TTableWindowData::value_type& GetData() const { return m_pData; } - const VclPtr<OTableWindowTitle>& GetTitleCtrl() { return m_xTitle; } + const VclPtr<OTableWindowTitle>& GetTitleCtrl() const { return m_xTitle; } /** returns the name which should be used when displaying join or relations @return diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index 9af27758e61b..bebbcff2803f 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -154,7 +154,7 @@ namespace dbaui void WriteTables(); void WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_Int32 nHeightPixel,const char* pChar,const OUString& rValue,const char* pHtmlTag); void IncIndent( sal_Int16 nVal ); - const char* GetIndentStr() { return sIndent; } + const char* GetIndentStr() const { return sIndent; } void FontOn(); inline void FontOff(); diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 708e47329cdc..7f73941d66dd 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -312,7 +312,7 @@ namespace dbaui void applyParserFilter(const OUString& _rOldFilter, bool _bOldFilterApplied,const ::OUString& _sOldHaving,const css::uno::Reference< css::sdb::XSingleSelectQueryComposer >& _xParser); void applyParserOrder(const OUString& _rOldOrder,const css::uno::Reference< css::sdb::XSingleSelectQueryComposer >& _xParser); - sal_Int16 getCurrentColumnPosition(); + sal_Int16 getCurrentColumnPosition() const; void setCurrentColumnPosition( sal_Int16 _nPos ); void addColumnListeners(const css::uno::Reference< css::awt::XControlModel > & _xGridControlModel); diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index f3ddc8add4ca..acbc3d54f5b9 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -75,7 +75,7 @@ namespace dbaui void showStatus( const OUString& _rStatus ); void hideStatus(); - const css::uno::Reference< css::awt::XControlContainer >& getContainer() { return m_xMe; } + const css::uno::Reference< css::awt::XControlContainer >& getContainer() const { return m_xMe; } private: virtual bool PreNotify( NotifyEvent& rNEvt ) override; diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index d71f0ff1c649..0d27ba5439ee 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -38,7 +38,7 @@ namespace dbaui public: DlgSize(weld::Window * pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard = -1); virtual ~DlgSize() override; - sal_Int32 GetValue(); + sal_Int32 GetValue() const; }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index 0daab302f6ec..1a38fc1c893d 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -69,7 +69,7 @@ namespace dbaui void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); } bool get_sensitive() const { return m_xControl->get_sensitive(); } void grab_focus() { m_xControl->grab_focus(); } - int get_count() { return m_xControl->get_count(); } + int get_count() const { return m_xControl->get_count(); } void set_active(int nPos) { m_xControl->set_active(nPos); } void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xControl->connect_changed(rLink); } diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index eb9d9071a9e1..607a38c82920 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -66,9 +66,9 @@ namespace dbaui OQueryDesignView* getDesignView() { return m_pViewSwitch->getDesignView(); } - bool isCutAllowed() { return m_pViewSwitch->isCutAllowed(); } - bool isPasteAllowed() { return m_pViewSwitch->isPasteAllowed(); } - bool isCopyAllowed() { return m_pViewSwitch->isCopyAllowed(); } + bool isCutAllowed() const { return m_pViewSwitch->isCutAllowed(); } + bool isPasteAllowed() const { return m_pViewSwitch->isPasteAllowed(); } + bool isCopyAllowed() const { return m_pViewSwitch->isCopyAllowed(); } void copy() { m_pViewSwitch->copy(); } void cut() { m_pViewSwitch->cut(); } void paste() { m_pViewSwitch->paste(); } diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index 9319c4690e4a..bbf3b72f1343 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -74,7 +74,7 @@ namespace dbaui // Cut, Copy, Paste by Accel. runs the action in the Edit but also the // corresponding slot in the View. Therefore, the action occurs twice. // To prevent this, SlotExec in View can call this function. - bool IsInAccelAct() { return m_bAccelAction; } + bool IsInAccelAct() const { return m_bAccelAction; } void stopTimer(); void startTimer(); diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index 85921215bc33..5df47663a8da 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -197,9 +197,9 @@ public: /** determine if the given entry is 'wildcard checked' @see checkWildcard */ - bool isWildcardChecked(weld::TreeIter& rEntry); + bool isWildcardChecked(const weld::TreeIter& rEntry); - std::unique_ptr<weld::TreeIter> GetEntryPosByName(const OUString& aName, weld::TreeIter* pStart = nullptr, const IEntryFilter* _pFilter = nullptr) const; + std::unique_ptr<weld::TreeIter> GetEntryPosByName(const OUString& aName, const weld::TreeIter* pStart = nullptr, const IEntryFilter* _pFilter = nullptr) const; void CheckButtons(); // make the button states consistent (bottom-up) diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index 27840ac35d7c..d02abd5dbfd1 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -145,7 +145,7 @@ OConnectionLine& OConnectionLine::operator=( const OConnectionLine& rLine ) return *this; } -tools::Rectangle OConnectionLine::GetBoundingRect() +tools::Rectangle OConnectionLine::GetBoundingRect() const { // determine surrounding rectangle tools::Rectangle aBoundingRect( Point(0,0), Point(0,0) ); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 12521c4f6243..5e15f4b9cde0 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -236,7 +236,7 @@ void OJoinTableView::Resize() } } -sal_uLong OJoinTableView::GetTabWinCount() +sal_uLong OJoinTableView::GetTabWinCount() const { return m_aTableMap.size(); } diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.hxx b/dbaccess/source/ui/querydesign/QTableWindowData.hxx index ac74a39a7508..8acab3bd4097 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.hxx @@ -33,7 +33,7 @@ namespace dbaui explicit OQueryTableWindowData(const OUString& _rComposedName, const OUString& rTableName, const OUString& rTableAlias); virtual ~OQueryTableWindowData() override; - OUString const & GetAliasName() { return GetWinName(); } + OUString const & GetAliasName() const { return GetWinName(); } void SetAliasName(const OUString& rNewAlias) { SetWinName(rNewAlias); } }; } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index ab8ed4c847d8..b0a7129f8eaf 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2569,7 +2569,7 @@ void OQueryDesignView::copy() m_pSelectionBox->copy(); } -bool OQueryDesignView::isCutAllowed() +bool OQueryDesignView::isCutAllowed() const { bool bAllowed = false; if ( SELECTION == m_eChildFocus ) @@ -2577,7 +2577,7 @@ bool OQueryDesignView::isCutAllowed() return bAllowed; } -bool OQueryDesignView::isPasteAllowed() +bool OQueryDesignView::isPasteAllowed() const { bool bAllowed = false; if ( SELECTION == m_eChildFocus ) @@ -2585,7 +2585,7 @@ bool OQueryDesignView::isPasteAllowed() return bAllowed; } -bool OQueryDesignView::isCopyAllowed() +bool OQueryDesignView::isCopyAllowed() const { bool bAllowed = false; if ( SELECTION == m_eChildFocus ) diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index 3ff1296c8579..58542fba5c6e 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -68,7 +68,7 @@ void OQueryTextView::Resize() m_pEdit->SetSizePixel( GetOutputSizePixel() ); } -OUString OQueryTextView::getStatement() +OUString OQueryTextView::getStatement() const { return m_pEdit->GetText(); } @@ -94,7 +94,7 @@ void OQueryTextView::copy() m_pEdit->Copy(); } -bool OQueryTextView::isCutAllowed() +bool OQueryTextView::isCutAllowed() const { return !m_pEdit->GetSelected().isEmpty(); } diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index c9c59eae908c..ba3cee82640d 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -101,21 +101,21 @@ void OQueryViewSwitch::copy() m_pDesignView->copy(); } -bool OQueryViewSwitch::isCutAllowed() +bool OQueryViewSwitch::isCutAllowed() const { if(m_pTextView->IsVisible()) return m_pTextView->isCutAllowed(); return m_pDesignView->isCutAllowed(); } -bool OQueryViewSwitch::isCopyAllowed() +bool OQueryViewSwitch::isCopyAllowed() const { if(m_pTextView->IsVisible()) return true; return m_pDesignView->isCopyAllowed(); } -bool OQueryViewSwitch::isPasteAllowed() +bool OQueryViewSwitch::isPasteAllowed() const { if(m_pTextView->IsVisible()) return true; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 513687abfa98..edb0799da3bc 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2336,7 +2336,7 @@ sal_uInt32 OSelectionBrowseBox::GetTotalCellWidth(long nRowId, sal_uInt16 nColId return GetDataWindow().LogicToPixel(Size(GetDataWindow().GetTextWidth(strText),0)).Width(); } -bool OSelectionBrowseBox::isCutAllowed() +bool OSelectionBrowseBox::isCutAllowed() const { bool bCutAllowed = false; long nRow = GetRealRow(GetCurRow()); @@ -2393,7 +2393,7 @@ void OSelectionBrowseBox::paste() invalidateUndoRedo(); } -bool OSelectionBrowseBox::isPasteAllowed() +bool OSelectionBrowseBox::isPasteAllowed() const { bool bPasteAllowed = true; long nRow = GetRealRow(GetCurRow()); @@ -2409,7 +2409,7 @@ bool OSelectionBrowseBox::isPasteAllowed() return bPasteAllowed; } -bool OSelectionBrowseBox::isCopyAllowed() +bool OSelectionBrowseBox::isCopyAllowed() const { return isCutAllowed(); } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 9398a8294ad0..69769aaf65d2 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -122,9 +122,9 @@ namespace dbaui Size CalcOptimalSize( const Size& _rAvailable ); // can the current content be cut - bool isPasteAllowed(); - bool isCutAllowed(); - bool isCopyAllowed(); + bool isPasteAllowed() const; + bool isCutAllowed() const; + bool isCopyAllowed() const; void cut(); void paste(); void copy(); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index ea44f81885d8..3c31c7bb0b90 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -1138,7 +1138,7 @@ bool OTableEditorCtrl::IsCopyAllowed() return bIsCopyAllowed; } -bool OTableEditorCtrl::IsPasteAllowed() +bool OTableEditorCtrl::IsPasteAllowed() const { bool bAllowed = GetView()->getController().isAddAllowed(); if ( bAllowed ) diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index d017e2526d29..fe916961ca1a 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -144,7 +144,7 @@ namespace dbaui std::vector< std::shared_ptr<OTableRow> >* GetRowList(){ return m_pRowList; } - const std::shared_ptr<OTableRow>& GetActRow(){ return pActRow; } + const std::shared_ptr<OTableRow>& GetActRow() const { return pActRow; } void CellModified( long nRow, sal_uInt16 nColId ); void SetReadOnly( bool bRead ); @@ -153,8 +153,8 @@ namespace dbaui bool IsCutAllowed(); bool IsCopyAllowed(); - bool IsPasteAllowed(); - bool IsReadOnly() { return bReadOnly;} + bool IsPasteAllowed() const; + bool IsReadOnly() const { return bReadOnly;} OFieldDescription* GetFieldDescr( long nRow ); // Window overrides |