compilerplugins/clang/noexceptmove.cxx | 14 +++++++
cui/source/customize/CommandCategoryListBox.cxx | 2 -
cui/source/customize/CustomNotebookbarGenerator.cxx | 2 -
cui/source/customize/SvxNotebookbarConfigPage.cxx | 13 +++---
cui/source/customize/cfg.cxx | 8 ++--
cui/source/customize/cfgutil.cxx | 8 ++--
cui/source/customize/macropg.cxx | 2 -
cui/source/dialogs/DiagramDialog.cxx | 2 -
cui/source/dialogs/SpellDialog.cxx | 10 ++---
cui/source/dialogs/colorpicker.cxx | 4 +-
cui/source/dialogs/hldoctp.cxx | 2 -
cui/source/dialogs/hlmarkwn.cxx | 2 -
cui/source/dialogs/hltpbase.cxx | 2 -
cui/source/dialogs/scriptdlg.cxx | 4 +-
cui/source/dialogs/thesdlg.cxx | 2 -
cui/source/inc/CommandCategoryListBox.hxx | 2 -
cui/source/inc/DiagramDialog.hxx | 2 -
cui/source/inc/FontFeaturesDialog.hxx | 2 -
cui/source/inc/SpellDialog.hxx | 2 -
cui/source/inc/backgrnd.hxx | 2 -
cui/source/inc/cfg.hxx | 34 +++++++++---------
cui/source/inc/cfgutil.hxx | 20 +++++-----
cui/source/inc/cuitabarea.hxx | 6 +--
cui/source/inc/dlgname.hxx | 2 -
cui/source/inc/hldoctp.hxx | 2 -
cui/source/inc/hlmarkwn.hxx | 2 -
cui/source/inc/hltpbase.hxx | 2 -
cui/source/inc/insdlg.hxx | 2 -
cui/source/inc/macropg.hxx | 2 -
cui/source/inc/optdict.hxx | 2 -
cui/source/inc/page.hxx | 2 -
cui/source/inc/postdlg.hxx | 4 +-
cui/source/inc/scriptdlg.hxx | 8 ++--
cui/source/inc/srchxtra.hxx | 8 ++--
cui/source/inc/textanim.hxx | 2 -
cui/source/inc/thesdlg.hxx | 2 -
cui/source/options/optaboutconfig.hxx | 2 -
cui/source/options/optcolor.cxx | 2 -
cui/source/tabpages/backgrnd.cxx | 2 -
cui/source/tabpages/page.cxx | 2 -
cui/source/tabpages/textanim.cxx | 2 -
cui/source/tabpages/tppattern.cxx | 2 -
dbaccess/source/core/api/RowSetBase.hxx | 2 -
dbaccess/source/core/api/RowSetCache.cxx | 6 +--
dbaccess/source/core/api/RowSetCache.hxx | 8 ++--
dbaccess/source/filter/hsqldb/parseschema.hxx | 4 +-
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 4 +-
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 6 +--
dbaccess/source/ui/app/AppDetailView.cxx | 6 +--
dbaccess/source/ui/app/AppDetailView.hxx | 6 +--
dbaccess/source/ui/app/AppView.cxx | 8 ++--
dbaccess/source/ui/app/AppView.hxx | 8 ++--
dbaccess/source/ui/browser/brwctrlr.cxx | 2 -
dbaccess/source/ui/control/FieldDescControl.cxx | 6 +--
dbaccess/source/ui/control/tabletree.cxx | 4 +-
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 8 ++--
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 8 ++--
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 2 -
dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 2 -
dbaccess/source/ui/dlg/UserAdmin.cxx | 2 -
dbaccess/source/ui/dlg/UserAdmin.hxx | 2 -
dbaccess/source/ui/dlg/dlgsize.cxx | 2 -
dbaccess/source/ui/dlg/tablespage.cxx | 2 -
dbaccess/source/ui/dlg/tablespage.hxx | 2 -
dbaccess/source/ui/inc/ConnectionLine.hxx | 2 -
dbaccess/source/ui/inc/FieldDescControl.hxx | 6 +--
dbaccess/source/ui/inc/JoinTableView.hxx | 2 -
dbaccess/source/ui/inc/QueryDesignView.hxx | 6 +--
dbaccess/source/ui/inc/QueryTextView.hxx | 4 +-
dbaccess/source/ui/inc/QueryViewSwitch.hxx | 6 +--
dbaccess/source/ui/inc/TableController.hxx | 2 -
dbaccess/source/ui/inc/TableDesignControl.hxx | 2 -
dbaccess/source/ui/inc/TableWindow.hxx | 2 -
dbaccess/source/ui/inc/TokenWriter.hxx | 2 -
dbaccess/source/ui/inc/brwctrlr.hxx | 2 -
dbaccess/source/ui/inc/brwview.hxx | 2 -
dbaccess/source/ui/inc/dlgsize.hxx | 2 -
dbaccess/source/ui/inc/opendoccontrols.hxx | 2 -
dbaccess/source/ui/inc/querycontainerwindow.hxx | 6 +--
dbaccess/source/ui/inc/sqledit.hxx | 2 -
dbaccess/source/ui/inc/tabletree.hxx | 4 +-
dbaccess/source/ui/querydesign/ConnectionLine.cxx | 2 -
dbaccess/source/ui/querydesign/JoinTableView.cxx | 2 -
dbaccess/source/ui/querydesign/QTableWindowData.hxx | 2 -
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 6 +--
dbaccess/source/ui/querydesign/QueryTextView.cxx | 4 +-
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 6 +--
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 6 +--
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 6 +--
dbaccess/source/ui/tabledesign/TEditControl.cxx | 2 -
dbaccess/source/ui/tabledesign/TEditControl.hxx | 6 +--
91 files changed, 205 insertions(+), 190 deletions(-)
New commits:
commit 9dac199094a71a9f0d806c39a6a990b31f5e0f4c
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Sep 4 20:29:51 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Sep 5 08:27:43 2019 +0200
loplugin:noexceptmove improve feedback
Change-Id: I16612abd535812bdb9d46aa9886b1e02747aab6f
Reviewed-on: https://gerrit.libreoffice.org/78614
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/noexceptmove.cxx
b/compilerplugins/clang/noexceptmove.cxx
index 1920d11ac571..1a1f2de41971 100644
--- a/compilerplugins/clang/noexceptmove.cxx
+++ b/compilerplugins/clang/noexceptmove.cxx
@@ -206,6 +206,13 @@ bool NoExceptMove::VisitCXXConstructExpr(const
CXXConstructExpr* constructExpr)
; // ok, non-throwing
else if (IsCallThrowsSpec(est))
{
+ if (bLookForStuffWeCanFix)
+ {
+ if (est == EST_None && !ignoreLocation(constructorDecl))
+ m_Exclusions.back().push_back(constructorDecl);
+ else
+ m_CannotFix.back() = true;
+ }
m_ConstructorThrows.back() = true;
}
return true;
@@ -232,6 +239,13 @@ bool NoExceptMove::VisitVarDecl(const VarDecl* varDecl)
; // ok, non-throwing
else if (IsCallThrowsSpec(est))
{
+ if (bLookForStuffWeCanFix)
+ {
+ if (est == EST_None && !ignoreLocation(destructorDecl))
+ m_Exclusions.back().push_back(destructorDecl);
+ else
+ m_CannotFix.back() = true;
+ }
m_ConstructorThrows.back() = true;
}
return true;
commit 6c9917c7a74e1c14f1c60ad40b96470b6ef08936
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Sep 4 16:08:36 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Sep 5 08:27:23 2019 +0200
loplugin:constmethod in dbaccess
Change-Id: I3bb4784e1a2d828eca30f255a9c9bb4248309b81
Reviewed-on: https://gerrit.libreoffice.org/78603
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
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
commit 51fa45c8b8ee2ff37beef9639dc1ce5ed1e38e8f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Sep 4 16:07:56 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Sep 5 08:27:12 2019 +0200
loplugin:constmethod in cui
Change-Id: I06ffacbb02f3e9088e9c1a51e0e3e0d65d356f62
Reviewed-on: https://gerrit.libreoffice.org/78602
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/cui/source/customize/CommandCategoryListBox.cxx
b/cui/source/customize/CommandCategoryListBox.cxx
index 1591e208b7cc..1df6422db190 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -482,7 +482,7 @@ void
CommandCategoryListBox::SetStylesInfo(SfxStylesInfo_Impl* pStyles)
}
void CommandCategoryListBox::addChildren(
- weld::TreeIter* parentEntry, const css::uno::Reference<
css::script::browse::XBrowseNode > &parentNode,
+ const weld::TreeIter* parentEntry, const css::uno::Reference<
css::script::browse::XBrowseNode > &parentNode,
CuiConfigFunctionListBox* pFunctionListBox, const OUString& filterTerm ,
SaveInData *pCurrentSaveInData,
std::vector<std::unique_ptr<weld::TreeIter>> &rNodesToExpand)
{
diff --git a/cui/source/customize/CustomNotebookbarGenerator.cxx
b/cui/source/customize/CustomNotebookbarGenerator.cxx
index dee8e141d37c..9bff37e428d7 100644
--- a/cui/source/customize/CustomNotebookbarGenerator.cxx
+++ b/cui/source/customize/CustomNotebookbarGenerator.cxx
@@ -176,7 +176,7 @@ static void searchNodeAndAttribute(xmlNode* pNodePtr, char*
pUIItemID, char* pPr
}
}
-static xmlDocPtr notebookbarXMLParser(char* pDocName, char* pUIItemID, char*
pProperty,
+static xmlDocPtr notebookbarXMLParser(const char* pDocName, char* pUIItemID,
char* pProperty,
char* pValue)
{
xmlDocPtr pDocPtr;
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx
b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index 40d26bada76d..521aafcfa67e 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -48,8 +48,8 @@ namespace container = com::sun::star::container;
namespace beans = com::sun::star::beans;
namespace graphic = com::sun::star::graphic;
-static bool isCategoryAvailable(OUString& sClassId, OUString& sUIItemId,
OUString& sActiveCategory,
- bool& isCategory)
+static bool isCategoryAvailable(const OUString& sClassId, const OUString&
sUIItemId,
+ const OUString& sActiveCategory, bool&
isCategory)
{
if (sUIItemId == sActiveCategory)
return true;
@@ -218,8 +218,9 @@ short SvxNotebookbarConfigPage::QueryReset()
return nValue;
}
-void SvxConfigPage::InsertEntryIntoNotebookbarTabUI(OUString& sClassId,
OUString& sUIItemId,
- OUString& sUIItemCommand,
int nPos,
+void SvxConfigPage::InsertEntryIntoNotebookbarTabUI(const OUString& sClassId,
+ const OUString& sUIItemId,
+ const OUString&
sUIItemCommand, int nPos,
int nStartCol)
{
OUString sAppName, sFileName;
@@ -519,8 +520,8 @@
SvxNotebookbarEntriesListBox::SvxNotebookbarEntriesListBox(std::unique_ptr<weld:
SvxNotebookbarEntriesListBox::~SvxNotebookbarEntriesListBox() {}
-static void EditRegistryFile(OUString& sUIItemId, OUString& sSetEntry,
- OUString& sNotebookbarInterface)
+static void EditRegistryFile(const OUString& sUIItemId, const OUString&
sSetEntry,
+ const OUString& sNotebookbarInterface)
{
int nFlag = 0;
Sequence<OUString> aOldEntries
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index e30cb708c99b..45319736b7db 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1305,7 +1305,7 @@ OUString SvxConfigPage::GetScriptURL() const
return result;
}
-OUString SvxConfigPage::GetSelectedDisplayName()
+OUString SvxConfigPage::GetSelectedDisplayName() const
{
return m_xFunctions->get_selected_text();
}
@@ -1873,17 +1873,17 @@ SvxConfigEntry::~SvxConfigEntry()
}
}
-bool SvxConfigEntry::IsMovable()
+bool SvxConfigEntry::IsMovable() const
{
return !IsPopup() || IsMain();
}
-bool SvxConfigEntry::IsDeletable()
+bool SvxConfigEntry::IsDeletable() const
{
return !IsMain() || IsUserDefined();
}
-bool SvxConfigEntry::IsRenamable()
+bool SvxConfigEntry::IsRenamable() const
{
return !IsMain() || IsUserDefined();
}
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 1e675a682296..ebfc025ea27c 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -149,7 +149,7 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl&
aStyle)
}
}
-std::vector< SfxStyleInfo_Impl > SfxStylesInfo_Impl::getStyleFamilies()
+std::vector< SfxStyleInfo_Impl > SfxStylesInfo_Impl::getStyleFamilies() const
{
// It's an optional interface!
css::uno::Reference< css::style::XStyleFamiliesSupplier > xModel(m_xDoc,
css::uno::UNO_QUERY);
@@ -255,7 +255,7 @@ OUString CuiConfigFunctionListBox::GetHelpText( bool
bConsiderParent )
return OUString();
}
-OUString CuiConfigFunctionListBox::GetCurCommand()
+OUString CuiConfigFunctionListBox::GetCurCommand() const
{
SfxGroupInfo_Impl *pData =
reinterpret_cast<SfxGroupInfo_Impl*>(get_selected_id().toInt64());
if (!pData)
@@ -263,7 +263,7 @@ OUString CuiConfigFunctionListBox::GetCurCommand()
return pData->sCommand;
}
-OUString CuiConfigFunctionListBox::GetCurLabel()
+OUString CuiConfigFunctionListBox::GetCurLabel() const
{
SfxGroupInfo_Impl *pData =
reinterpret_cast<SfxGroupInfo_Impl*>(get_selected_id().toInt64());
if (!pData)
@@ -317,7 +317,7 @@ void CuiConfigFunctionListBox::ClearAll()
m_xTreeView->clear();
}
-OUString CuiConfigFunctionListBox::GetSelectedScriptURI()
+OUString CuiConfigFunctionListBox::GetSelectedScriptURI() const
{
SfxGroupInfo_Impl *pData =
reinterpret_cast<SfxGroupInfo_Impl*>(get_selected_id().toInt64());
if (pData && pData->nKind == SfxCfgKind::FUNCTION_SCRIPT)
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 453a764db608..b75e48a9709f 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -397,7 +397,7 @@ IMPL_LINK_NOARG( SvxMacroTabPage_, DoubleClickHdl_Impl,
weld::TreeView&, void)
}
// handler for double click on the listbox, and for the assign/delete buttons
-void SvxMacroTabPage_::GenericHandler_Impl(SvxMacroTabPage_* pThis,
weld::Button* pBtn)
+void SvxMacroTabPage_::GenericHandler_Impl(SvxMacroTabPage_* pThis, const
weld::Button* pBtn)
{
SvxMacroTabPage_Impl* pImpl = pThis->mpImpl.get();
weld::TreeView& rListBox = *pImpl->xEventLB;
diff --git a/cui/source/dialogs/DiagramDialog.cxx
b/cui/source/dialogs/DiagramDialog.cxx
index f3b84c0fcc4e..4891ef93daee 100644
--- a/cui/source/dialogs/DiagramDialog.cxx
+++ b/cui/source/dialogs/DiagramDialog.cxx
@@ -49,7 +49,7 @@ IMPL_LINK_NOARG(DiagramDialog, OnAddClick, weld::Button&,
void)
}
}
-void DiagramDialog::populateTree(weld::TreeIter* pParent, const OUString&
rParentId)
+void DiagramDialog::populateTree(const weld::TreeIter* pParent, const
OUString& rParentId)
{
auto aItems = mpDiagramData->getChildren(rParentId);
for (auto& aItem : aItems)
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index ef8f08cd216c..ab03a51c4e15 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -112,18 +112,18 @@ public:
sal_uInt16 GetId() const;
void SetEnableChangePB(){m_bEnableChangePB = true;}
- bool IsEnableChangePB(){return m_bEnableChangePB;}
+ bool IsEnableChangePB() const {return
m_bEnableChangePB;}
void SetEnableChangeAllPB(){m_bEnableChangeAllPB =
true;}
- bool IsEnableChangeAllPB(){return m_bEnableChangeAllPB;}
+ bool IsEnableChangeAllPB() const {return
m_bEnableChangeAllPB;}
void SetErrorMove(long nOldStart, long nOldEnd)
{
m_nOldErrorStart = nOldStart;
m_nOldErrorEnd = nOldEnd;
}
- long GetOldErrorStart() { return m_nOldErrorStart;}
- long GetOldErrorEnd() { return m_nOldErrorEnd;}
+ long GetOldErrorStart() const { return
m_nOldErrorStart;}
+ long GetOldErrorEnd() const { return m_nOldErrorEnd;}
void SetErrorLanguageSelected(bool bSet){
m_bIsErrorLanguageSelected = bSet;}
bool IsErrorLanguageSelected() const {return
m_bIsErrorLanguageSelected;}
@@ -1982,7 +1982,7 @@ void SentenceEditWindow_Impl::AddUndoAction(
std::unique_ptr<SfxUndoAction> pAct
GetSpellDialog()->m_xUndoPB->set_sensitive(true);
}
-size_t SentenceEditWindow_Impl::GetUndoActionCount()
+size_t SentenceEditWindow_Impl::GetUndoActionCount() const
{
return m_xEditEngine->GetUndoManager().GetUndoActionCount();
}
diff --git a/cui/source/dialogs/colorpicker.cxx
b/cui/source/dialogs/colorpicker.cxx
index e96037e747df..bddca8e8ca81 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -209,8 +209,8 @@ public:
void Modify();
void SetValues(Color aColor, ColorMode eMode, double x, double y);
- double GetX() { return mdX;}
- double GetY() { return mdY;}
+ double GetX() const { return mdX;}
+ double GetY() const { return mdY;}
void SetModifyHdl(const Link<ColorFieldControl&,void>& rLink) {
maModifyHdl = rLink; }
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index d9fb18906392..c0dbd18ec0ee 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -92,7 +92,7 @@ void SvxHyperlinkDocTp::FillDlgFields(const OUString& rStrURL)
|* retrieve current url-string
|*
|************************************************************************/
-OUString SvxHyperlinkDocTp::GetCurrentURL ()
+OUString SvxHyperlinkDocTp::GetCurrentURL () const
{
// get data from dialog-controls
OUString aStrURL;
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 833c4f75efa7..9589f6087b00 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -277,7 +277,7 @@ bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString&
aURL)
}
// Fill Tree-Control
-int SvxHlinkDlgMarkWnd::FillTree( const uno::Reference< container::XNameAccess
>& xLinks, weld::TreeIter* pParentEntry )
+int SvxHlinkDlgMarkWnd::FillTree( const uno::Reference< container::XNameAccess
>& xLinks, const weld::TreeIter* pParentEntry )
{
int nEntries=0;
const uno::Sequence< OUString > aNames( xLinks->getElementNames() );
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 828657b08a5f..b2dc2711dc93 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -377,7 +377,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase,
ClickScriptHdl_Impl, weld::Button&, voi
}
// Get Macro-Infos
-HyperDialogEvent SvxHyperlinkTabPageBase::GetMacroEvents()
+HyperDialogEvent SvxHyperlinkTabPageBase::GetMacroEvents() const
{
const SvxHyperlinkItem *pHyperlinkItem = static_cast<const
SvxHyperlinkItem *>(
GetItemSet().GetItem
(SID_HYPERLINK_GETLINK));
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index c3e0314502c8..588059081506 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -67,7 +67,7 @@ static void ShowErrorDialog( const Any& aException )
pDlg->Execute();
}
-void SvxScriptOrgDialog::delUserData(weld::TreeIter& rIter)
+void SvxScriptOrgDialog::delUserData(const weld::TreeIter& rIter)
{
SFEntry* pUserData =
reinterpret_cast<SFEntry*>(m_xScriptsBox->get_id(rIter).toInt64());
if (pUserData)
@@ -881,7 +881,7 @@ void SvxScriptOrgDialog::createEntry(weld::TreeIter& rEntry)
}
}
-void SvxScriptOrgDialog::renameEntry(weld::TreeIter& rEntry)
+void SvxScriptOrgDialog::renameEntry(const weld::TreeIter& rEntry)
{
Reference< browse::XBrowseNode > aChildNode;
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 1ed20384016c..dcb8805e7a0d 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -332,7 +332,7 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType
nLanguage )
m_xDialog->set_title(aStr); // set window title
}
-OUString SvxThesaurusDialog::GetWord()
+OUString SvxThesaurusDialog::GetWord() const
{
return m_xReplaceEdit->get_text();
}
diff --git a/cui/source/inc/CommandCategoryListBox.hxx
b/cui/source/inc/CommandCategoryListBox.hxx
index acc353b93a73..209ae83ffd42 100644
--- a/cui/source/inc/CommandCategoryListBox.hxx
+++ b/cui/source/inc/CommandCategoryListBox.hxx
@@ -70,7 +70,7 @@ public:
// Adds children of the given macro group to the functions list
void addChildren(
- weld::TreeIter* parentEntry, const
css::uno::Reference<com::sun::star::script::browse::XBrowseNode> &parentNode,
+ const weld::TreeIter* parentEntry, const
css::uno::Reference<com::sun::star::script::browse::XBrowseNode> &parentNode,
CuiConfigFunctionListBox* pFunctionListBox, const OUString &filterTerm
, SaveInData *pCurrentSaveInData,
std::vector<std::unique_ptr<weld::TreeIter>> &rNodesToExpand);
};
diff --git a/cui/source/inc/DiagramDialog.hxx b/cui/source/inc/DiagramDialog.hxx
index c1ce3316427e..461ffee9a7e6 100644
--- a/cui/source/inc/DiagramDialog.hxx
+++ b/cui/source/inc/DiagramDialog.hxx
@@ -32,7 +32,7 @@ private:
DECL_LINK(OnAddClick, weld::Button&, void);
- void populateTree(weld::TreeIter* pParent, const OUString& rParentId);
+ void populateTree(const weld::TreeIter* pParent, const OUString&
rParentId);
};
#endif // INCLUDED_CUI_SOURCE_INC_DIAGRAMDIALOG_HXX
diff --git a/cui/source/inc/FontFeaturesDialog.hxx
b/cui/source/inc/FontFeaturesDialog.hxx
index 3e4157129944..d30f92305067 100644
--- a/cui/source/inc/FontFeaturesDialog.hxx
+++ b/cui/source/inc/FontFeaturesDialog.hxx
@@ -66,7 +66,7 @@ public:
~FontFeaturesDialog() override;
virtual short run() override;
- OUString const& getResultFontName() { return m_sResultFontName; }
+ OUString const& getResultFontName() const { return m_sResultFontName; }
void updateFontPreview();
};
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 7775ea347dbf..65de78342f7e 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -109,7 +109,7 @@ public:
void ResetUndo();
void Undo();
void AddUndoAction( std::unique_ptr<SfxUndoAction> pAction );
- size_t GetUndoActionCount();
+ size_t GetUndoActionCount() const;
void UndoActionStart( sal_uInt16 nId );
void UndoActionEnd();
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 78c82a6448ac..099997775374 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -141,7 +141,7 @@ private:
bool LoadLinkedGraphic_Impl();
void RaiseLoadError_Impl();
void SetGraphicPosition_Impl( SvxGraphicPosition ePos );
- SvxGraphicPosition GetGraphicPosition_Impl();
+ SvxGraphicPosition GetGraphicPosition_Impl() const;
void FillControls_Impl(const SvxBrushItem& rBgdAttr,
const OUString& rUserData);
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 5d6a677f8eab..4b4e308803bd 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -121,26 +121,26 @@ public:
const css::uno::Reference< css::uno::XInterface >& xManager );
void SetModified( bool bValue = true ) { bModified = bValue; }
- bool IsModified( ) { return bModified; }
+ bool IsModified( ) const { return bModified; }
- bool IsReadOnly( ) { return bReadOnly; }
- bool IsDocConfig( ) { return bDocConfig; }
+ bool IsReadOnly( ) const { return bReadOnly; }
+ bool IsDocConfig( ) const { return bDocConfig; }
const css::uno::Reference
< css::ui::XUIConfigurationManager >&
- GetConfigManager() { return m_xCfgMgr; };
+ GetConfigManager() const { return m_xCfgMgr; };
const css::uno::Reference
< css::ui::XUIConfigurationManager >&
- GetParentConfigManager() { return m_xParentCfgMgr; };
+ GetParentConfigManager() const { return m_xParentCfgMgr; };
const css::uno::Reference
< css::ui::XImageManager >&
- GetImageManager() { return m_xImgMgr; };
+ GetImageManager() const { return m_xImgMgr; };
const css::uno::Reference
< css::ui::XImageManager >&
- GetParentImageManager() { return m_xParentImgMgr; };
+ GetParentImageManager() const { return m_xParentImgMgr; };
css::uno::Reference
< css::container::XNameAccess > m_xCommandToLabelMap;
@@ -288,17 +288,17 @@ public:
void SetEntries( std::unique_ptr<SvxEntries> entries ) { mpEntries =
std::move(entries); }
void SetMain() { bIsMain = true; }
- bool IsMain() { return bIsMain; }
+ bool IsMain() const { return bIsMain; }
void SetParentData( bool bValue = true ) { bIsParentData = bValue; }
- bool IsParentData() { return bIsParentData; }
+ bool IsParentData() const { return bIsParentData; }
void SetModified( bool bValue = true ) { bIsModified = bValue; }
- bool IsModified() { return bIsModified; }
+ bool IsModified() const { return bIsModified; }
- bool IsMovable();
- bool IsDeletable();
- bool IsRenamable();
+ bool IsMovable() const;
+ bool IsDeletable() const;
+ bool IsRenamable() const;
void SetVisible( bool b ) { bIsVisible = b; }
bool IsVisible() const { return bIsVisible; }
@@ -306,7 +306,7 @@ public:
void SetBackupGraphic( css::uno::Reference< css::graphic::XGraphic >
const & graphic )
{ xBackupGraphic = graphic; }
- const css::uno::Reference< css::graphic::XGraphic >& GetBackupGraphic()
+ const css::uno::Reference< css::graphic::XGraphic >& GetBackupGraphic()
const
{ return xBackupGraphic; }
sal_Int32 GetStyle() const { return nStyle; }
@@ -435,7 +435,7 @@ protected:
void InsertEntryIntoUI(SvxConfigEntry* pNewEntryData,
int nPos, int nStartCol);
- void InsertEntryIntoNotebookbarTabUI(OUString& sClassId ,OUString&
sUIItemId, OUString& sUIItemCommand, int nPos,
+ void InsertEntryIntoNotebookbarTabUI(const OUString& sClassId, const
OUString& sUIItemId, const OUString& sUIItemCommand, int nPos,
int nStartCol);
SvxEntries* FindParentForChild( SvxEntries* pParentEntries,
@@ -483,7 +483,7 @@ public:
GetFrameWithDefaultAndIdentify( css::uno::Reference<
css::frame::XFrame >& _inout_rxFrame );
OUString GetScriptURL() const;
- OUString GetSelectedDisplayName();
+ OUString GetSelectedDisplayName() const;
};
class SvxMainMenuOrganizerDialog : public weld::GenericDialogController
@@ -576,7 +576,7 @@ public:
SvxNewToolbarDialog(weld::Window* pWindow, const OUString& rName);
virtual ~SvxNewToolbarDialog() override;
- OUString GetName()
+ OUString GetName() const
{
return m_xEdtName->get_text();
}
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 8b69238cfbaf..331a59a21d8d 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -68,7 +68,7 @@ public:
static bool parseStyleCommand(SfxStyleInfo_Impl& aStyle);
void getLabel4Style(SfxStyleInfo_Impl& aStyle);
- std::vector< SfxStyleInfo_Impl > getStyleFamilies();
+ std::vector< SfxStyleInfo_Impl > getStyleFamilies() const;
std::vector< SfxStyleInfo_Impl > getStyles(const OUString& sFamily);
static OUString generateCommand(const OUString& sFamily, const
OUString& sStyle);
@@ -114,29 +114,29 @@ public:
void connect_row_activated(const Link<weld::TreeView&, void>& rLink) {
m_xTreeView->connect_row_activated(rLink); }
void freeze() { m_xTreeView->freeze(); }
void thaw() { m_xTreeView->thaw(); }
- void append(const OUString& rId, const OUString& rStr, weld::TreeIter*
pParent = nullptr)
+ void append(const OUString& rId, const OUString& rStr, const
weld::TreeIter* pParent = nullptr)
{
m_xTreeView->insert(pParent, -1, &rStr, &rId, nullptr, nullptr,
nullptr, false, nullptr);
}
- std::unique_ptr<weld::TreeIter> tree_append(const OUString& rId, const
OUString& rStr, weld::TreeIter* pParent = nullptr)
+ std::unique_ptr<weld::TreeIter> tree_append(const OUString& rId, const
OUString& rStr, const weld::TreeIter* pParent = nullptr)
{
std::unique_ptr<weld::TreeIter> xIter(m_xTreeView->make_iterator());
m_xTreeView->insert(pParent, -1, &rStr, &rId, nullptr, nullptr,
nullptr, false, xIter.get());
return xIter;
}
- void append(const OUString& rId, const OUString& rStr, const OUString&
rImage, weld::TreeIter* pParent = nullptr)
+ void append(const OUString& rId, const OUString& rStr, const OUString&
rImage, const weld::TreeIter* pParent = nullptr)
{
m_xTreeView->insert(pParent, -1, &rStr, &rId, nullptr, nullptr,
&rImage, false, nullptr);
}
- void append(const OUString& rId, const OUString& rStr, const
css::uno::Reference<css::graphic::XGraphic>& rImage, weld::TreeIter* pParent =
nullptr)
+ void append(const OUString& rId, const OUString& rStr, const
css::uno::Reference<css::graphic::XGraphic>& rImage, const weld::TreeIter*
pParent = nullptr)
{
m_xTreeView->insert(pParent, -1, &rStr, &rId, nullptr, nullptr,
nullptr, false, m_xScratchIter.get());
m_xTreeView->set_image(*m_xScratchIter, rImage, -1);
}
void remove(int nPos) { m_xTreeView->remove(nPos); }
void scroll_to_row(int pos) { m_xTreeView->scroll_to_row(pos); }
- void remove(weld::TreeIter& rIter) { m_xTreeView->remove(rIter); }
- void expand_row(weld::TreeIter& rIter) { m_xTreeView->expand_row(rIter); }
+ void remove(const weld::TreeIter& rIter) { m_xTreeView->remove(rIter); }
+ void expand_row(const weld::TreeIter& rIter) {
m_xTreeView->expand_row(rIter); }
int n_children() const { return m_xTreeView->n_children(); }
std::unique_ptr<weld::TreeIter> make_iterator(const weld::TreeIter* pOrig
= nullptr) const { return m_xTreeView->make_iterator(pOrig); }
bool get_iter_first(weld::TreeIter& rIter) const { return
m_xTreeView->get_iter_first(rIter); }
@@ -171,10 +171,10 @@ public:
~CuiConfigFunctionListBox();
void ClearAll();
- OUString GetSelectedScriptURI();
+ OUString GetSelectedScriptURI() const;
OUString GetHelpText( bool bConsiderParent = true );
- OUString GetCurCommand();
- OUString GetCurLabel();
+ OUString GetCurCommand() const;
+ OUString GetCurLabel() const;
};
struct SvxConfigGroupBoxResource_Impl;
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index e60e718a28ce..92dab7b168c2 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -62,7 +62,7 @@ class ButtonBox
maButtonList.push_back(pButton);
maButtonToPos.insert( std::make_pair(pButton, maButtonList.size()
- 1) );
}
- sal_Int32 GetCurrentButtonPos() { return mnCurrentButton; }
+ sal_Int32 GetCurrentButtonPos() const { return mnCurrentButton; }
sal_Int32 GetButtonPos(weld::ToggleButton* pButton)
{
std::map<weld::ToggleButton*, sal_Int32>::const_iterator aBtnPos =
maButtonToPos.find(pButton);
@@ -251,7 +251,7 @@ protected:
void SelectFillType( weld::ToggleButton& rButton, const SfxItemSet* _pSet
= nullptr );
SfxTabPage* GetFillTabPage() { return m_pFillTabPage; }
- bool IsBtnClicked() { return m_bBtnClicked; }
+ bool IsBtnClicked() const { return m_bBtnClicked; }
private:
DECL_LINK(SelectFillTypeHdl_Impl, weld::ToggleButton&, void);
@@ -762,7 +762,7 @@ public:
void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; }
- void SetCtlPreviewOld( SfxItemSet& rAttrs ) {
m_aCtlPreviewOld.SetAttributes( rAttrs ); }
+ void SetCtlPreviewOld( const SfxItemSet& rAttrs ) {
m_aCtlPreviewOld.SetAttributes( rAttrs ); }
virtual void FillUserData() override;
};
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 83b42d409e07..a1e90f32db71 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -85,7 +85,7 @@ public:
SvxObjectNameDialog(weld::Window* pWindow, const OUString& rName);
// data access
- OUString GetName() { return m_xEdtName->get_text(); }
+ OUString GetName() const { return m_xEdtName->get_text(); }
// set handler
void SetCheckNameHdl(const Link<SvxObjectNameDialog&,bool>& rLink)
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index 53f302204bf0..9f5f8395f3c1 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -58,7 +58,7 @@ private:
SvxLinkInsertMode& eMode ) override;
virtual bool ShouldOpenMarkWnd () override {return m_bMarkWndOpen;}
virtual void SetMarkWndShouldOpen (bool bOpen) override
{m_bMarkWndOpen=bOpen;}
- OUString GetCurrentURL ();
+ OUString GetCurrentURL() const;
public:
SvxHyperlinkDocTp(weld::Container* pParent, SvxHpLinkDlg* pDlg, const
SfxItemSet* pItemSet);
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index e45baa8572f7..aa03d4da4ddf 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -50,7 +50,7 @@ protected:
std::unique_ptr<weld::TreeIter> FindEntry(const OUString& aStrName);
void ClearTree();
- int FillTree( const css::uno::Reference< css::container::XNameAccess >&
xLinks, weld::TreeIter* pParentEntry =nullptr );
+ int FillTree( const css::uno::Reference< css::container::XNameAccess >&
xLinks, const weld::TreeIter* pParentEntry =nullptr );
DECL_LINK( ClickApplyHdl_Impl, weld::Button&, void );
DECL_LINK( DoubleClickApplyHdl_Impl, weld::TreeView&, void );
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 7c88179d1477..278eab3dd853 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -129,7 +129,7 @@ protected:
SfxDispatcher* GetDispatcher() const;
- HyperDialogEvent GetMacroEvents();
+ HyperDialogEvent GetMacroEvents() const;
SvxMacroTableDtor* GetMacroTable();
};
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index a63d8587d658..50f14987b492 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -40,7 +40,7 @@ protected:
const OUString& rUIXMLDescription, const OString& rID,
const css::uno::Reference < css::embed::XStorage >& xStorage);
public:
- const css::uno::Reference<css::embed::XEmbeddedObject>& GetObject() {
return m_xObj; }
+ const css::uno::Reference<css::embed::XEmbeddedObject>& GetObject() const
{ return m_xObj; }
virtual css::uno::Reference<css::io::XInputStream>
GetIconIfIconified(OUString* pGraphicMediaType);
void SetHelpId(const OString& rHelpId) { m_xDialog->set_help_id(rHelpId); }
virtual bool IsCreateNew() const;
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index c80f848ec759..8cb4e5466b19 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -58,7 +58,7 @@ class SvxMacroTabPage_ : public SfxTabPage
DECL_LINK( AssignDeleteHdl_Impl, weld::Button&, void );
DECL_LINK( DoubleClickHdl_Impl, weld::TreeView&, void );
- static void GenericHandler_Impl( SvxMacroTabPage_* pThis, weld::Button*
pBtn );
+ static void GenericHandler_Impl( SvxMacroTabPage_* pThis, const
weld::Button* pBtn );
css::uno::Reference< css::container::XNameReplace > m_xAppEvents;
protected:
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 5921dc905490..4aed3f4305d0 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -50,7 +50,7 @@ private:
public:
SvxNewDictionaryDialog(weld::Window* pParent);
- const css::uno::Reference<css::linguistic2::XDictionary>&
GetNewDictionary() { return m_xNewDic; }
+ const css::uno::Reference<css::linguistic2::XDictionary>&
GetNewDictionary() const { return m_xNewDic; }
};
// class SvxEditDictionaryDialog -----------------------------------------
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index aa7209a8cd56..a52ca0cffc53 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -158,7 +158,7 @@ private:
bool IsPrinterRangeOverflow(weld::MetricSpinButton& rField,
long nFirstMargin,
long nLastMargin,
MarginPosition nPos);
void CheckMarginEdits( bool _bClear );
- bool IsMarginOutOfRange();
+ bool IsMarginOutOfRange() const;
SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rSet);
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index c3c086d89097..62a3379b9289 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -42,7 +42,7 @@ public:
virtual ~SvxPostItDialog() override;
static const sal_uInt16* GetRanges();
- const SfxItemSet* GetOutputItemSet() { return m_xOutSet.get(); }
+ const SfxItemSet* GetOutputItemSet() const { return m_xOutSet.get(); }
void SetPrevHdl( const Link<SvxPostItDialog&,void>& rLink )
{ m_aPrevHdlLink = rLink; }
@@ -71,7 +71,7 @@ public:
{
m_xDialog->set_title(rTitle);
}
- std::shared_ptr<weld::Dialog> const & GetDialog()
+ std::shared_ptr<weld::Dialog> const & GetDialog() const
{
return m_xDialog;
}
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 3efd5df17517..7ae0f333563e 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -70,8 +70,8 @@ public:
SFEntry( const css::uno::Reference<
css::script::browse::XBrowseNode >& entryNodes ,
const css::uno::Reference< css::frame::XModel >&
entryModel) { nodes = entryNodes; loaded=false; model = entryModel; }
SFEntry( const SFEntry& r ) { nodes = r.nodes; loaded =
r.loaded; }
- const css::uno::Reference< css::script::browse::XBrowseNode >& GetNode() {
return nodes ;}
- const css::uno::Reference< css::frame::XModel >& GetModel() { return model
;};
+ const css::uno::Reference< css::script::browse::XBrowseNode >& GetNode()
const { return nodes ;}
+ const css::uno::Reference< css::frame::XModel >& GetModel() const { return
model ;};
bool isLoaded() const { return loaded; }
void setLoaded() { loaded=true; }
};
@@ -108,7 +108,7 @@ protected:
void CheckButtons( css::uno::Reference<
css::script::browse::XBrowseNode > const & node );
void createEntry(weld::TreeIter& rEntry);
- void renameEntry(weld::TreeIter& rEntry);
+ void renameEntry(const weld::TreeIter& rEntry);
void deleteEntry(weld::TreeIter& rEntry);
css::uno::Reference<css::script::browse::XBrowseNode> getBrowseNode(const
weld::TreeIter& rEntry);
css::uno::Reference<css::frame::XModel> getModel(const weld::TreeIter&
rEntry);
@@ -117,7 +117,7 @@ protected:
void RestorePreviousSelection();
void Init(const OUString& language);
- void delUserData(weld::TreeIter& rIter);
+ void delUserData(const weld::TreeIter& rIter);
void deleteTree(weld::TreeIter& rIter);
void deleteAllTree();
void insertEntry(OUString const & rText, OUString const & rBitmap,
diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx
index 38ee2955aa0d..5513ae236a46 100644
--- a/cui/source/inc/srchxtra.hxx
+++ b/cui/source/inc/srchxtra.hxx
@@ -73,10 +73,10 @@ public:
sal_uInt16 nLonger);
virtual ~SvxSearchSimilarityDialog() override;
- sal_uInt16 GetOther() { return
static_cast<sal_uInt16>(m_xOtherFld->get_value()); }
- sal_uInt16 GetShorter() { return
static_cast<sal_uInt16>(m_xShorterFld->get_value()); }
- sal_uInt16 GetLonger() { return
static_cast<sal_uInt16>(m_xLongerFld->get_value()); }
- bool IsRelaxed() { return m_xRelaxBox->get_active(); }
+ sal_uInt16 GetOther() const { return
static_cast<sal_uInt16>(m_xOtherFld->get_value()); }
+ sal_uInt16 GetShorter() const { return
static_cast<sal_uInt16>(m_xShorterFld->get_value()); }
+ sal_uInt16 GetLonger() const { return
static_cast<sal_uInt16>(m_xLongerFld->get_value()); }
+ bool IsRelaxed() const { return m_xRelaxBox->get_active(); }
};
#endif
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 4a7339d4ee8b..ecc725edcb7b 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -75,7 +75,7 @@ private:
DECL_LINK( ClickDirectionHdl_Impl, weld::Button&, void );
void SelectDirection( SdrTextAniDirection nValue );
- sal_uInt16 GetSelectedDirection();
+ sal_uInt16 GetSelectedDirection() const;
public:
SvxTextAnimationPage(TabPageParent pPage, const SfxItemSet& rInAttrs);
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index 4172164f70ea..46af0be49cfd 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -74,7 +74,7 @@ public:
css::uno::Reference< css::linguistic2::XThesaurus >
const & xThesaurus,
const OUString &rWord, LanguageType nLanguage);
void SetWindowTitle( LanguageType nLanguage );
- OUString GetWord();
+ OUString GetWord() const;
};
#endif
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index c045ed42095e..989fbef6f0ad 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -77,7 +77,7 @@ public:
CuiAboutConfigValueDialog(weld::Window* pWindow, const OUString& rValue ,
int limit);
virtual ~CuiAboutConfigValueDialog() override;
- OUString getValue()
+ OUString getValue() const
{
return m_xEDValue->get_text();
}
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index d85381cc70a5..56f80cb5ab29 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -786,7 +786,7 @@ public:
void SetConfig (EditableColorConfig& rConfig) { pColorConfig = &rConfig; }
void SetExtendedConfig (EditableExtendedColorConfig& rConfig) {
pExtColorConfig = &rConfig; }
void Update ();
- long GetScrollPosition ()
+ long GetScrollPosition () const
{
return m_pVScroll->GetThumbPos();
}
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 86b9ca5dfd2e..d033764ff8aa 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -912,7 +912,7 @@ void SvxBackgroundTabPage::SetGraphicPosition_Impl(
SvxGraphicPosition ePos )
m_xWndPosition->Invalidate();
}
-SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl()
+SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl() const
{
if (m_xBtnTile->get_active())
return GPOS_TILED;
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 9a498c44d42e..58d4e8627475 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1502,7 +1502,7 @@ void SvxPageDescPage::CheckMarginEdits( bool _bClear )
m_nPos |= MARGIN_BOTTOM;
}
-bool SvxPageDescPage::IsMarginOutOfRange()
+bool SvxPageDescPage::IsMarginOutOfRange() const
{
bool bRet = ( ( ( !( m_nPos & MARGIN_LEFT ) &&
m_xLeftMarginEdit->get_value_changed_from_saved() ) &&
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 7048a030c36e..ecd5afdf5b8b 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -517,7 +517,7 @@ void SvxTextAnimationPage::SelectDirection(
SdrTextAniDirection nValue )
m_xBtnDown->set_active( nValue == SdrTextAniDirection::Down );
}
-sal_uInt16 SvxTextAnimationPage::GetSelectedDirection()
+sal_uInt16 SvxTextAnimationPage::GetSelectedDirection() const
{
SdrTextAniDirection nValue = SdrTextAniDirection::Left;
diff --git a/cui/source/tabpages/tppattern.cxx
b/cui/source/tabpages/tppattern.cxx
index 87f54a08c89c..ef96e4511c1e 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -57,7 +57,7 @@ public:
}
// BitmapCtl: Returns the Bitmap
- BitmapEx GetBitmapEx()
+ BitmapEx GetBitmapEx() const
{
if (!pBmpArray)
return BitmapEx();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
