mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:constmethod in cui

Browse Source 
Change-Id: I06ffacbb02f3e9088e9c1a51e0e3e0d65d356f62
Reviewed-on: https://gerrit.libreoffice.org/78602
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2019-09-04 16:07:56 +02:00
parent f8f606297d
commit 51fa45c8b8
41 changed files with 93 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cui/source/customize/CommandCategoryListBox.cxx
View File

@@ -482,7 +482,7 @@ void CommandCategoryListBox::SetStylesInfo(SfxStylesInfo_Impl* pStyles)
} }
void CommandCategoryListBox::addChildren( 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, CuiConfigFunctionListBox* pFunctionListBox, const OUString& filterTerm , SaveInData *pCurrentSaveInData,
std::vector<std::unique_ptr<weld::TreeIter>> &rNodesToExpand) std::vector<std::unique_ptr<weld::TreeIter>> &rNodesToExpand)
{ {

2
cui/source/customize/CustomNotebookbarGenerator.cxx
View File

@@ -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) char* pValue)
{ {
xmlDocPtr pDocPtr; xmlDocPtr pDocPtr;

13
cui/source/customize/SvxNotebookbarConfigPage.cxx
View File

@@ -48,8 +48,8 @@ namespace container = com::sun::star::container;
namespace beans = com::sun::star::beans; namespace beans = com::sun::star::beans;
namespace graphic = com::sun::star::graphic; namespace graphic = com::sun::star::graphic;
static bool isCategoryAvailable(OUString& sClassId, OUString& sUIItemId, OUString& sActiveCategory, static bool isCategoryAvailable(const OUString& sClassId, const OUString& sUIItemId,
bool& isCategory) const OUString& sActiveCategory, bool& isCategory)
{ {
if (sUIItemId == sActiveCategory) if (sUIItemId == sActiveCategory)
return true; return true;
@@ -218,8 +218,9 @@ short SvxNotebookbarConfigPage::QueryReset()
return nValue; return nValue;
} }
void SvxConfigPage::InsertEntryIntoNotebookbarTabUI(OUString& sClassId, OUString& sUIItemId, void SvxConfigPage::InsertEntryIntoNotebookbarTabUI(const OUString& sClassId,
OUString& sUIItemCommand, int nPos, const OUString& sUIItemId,
const OUString& sUIItemCommand, int nPos,
int nStartCol) int nStartCol)
{ {
OUString sAppName, sFileName; OUString sAppName, sFileName;
@@ -519,8 +520,8 @@ SvxNotebookbarEntriesListBox::SvxNotebookbarEntriesListBox(std::unique_ptr<weld:
SvxNotebookbarEntriesListBox::~SvxNotebookbarEntriesListBox() {} SvxNotebookbarEntriesListBox::~SvxNotebookbarEntriesListBox() {}
static void EditRegistryFile(OUString& sUIItemId, OUString& sSetEntry, static void EditRegistryFile(const OUString& sUIItemId, const OUString& sSetEntry,
OUString& sNotebookbarInterface) const OUString& sNotebookbarInterface)
{ {
int nFlag = 0; int nFlag = 0;
Sequence<OUString> aOldEntries Sequence<OUString> aOldEntries

8
cui/source/customize/cfg.cxx
View File

@@ -1305,7 +1305,7 @@ OUString SvxConfigPage::GetScriptURL() const
return result; return result;
} }
OUString SvxConfigPage::GetSelectedDisplayName() OUString SvxConfigPage::GetSelectedDisplayName() const
{ {
return m_xFunctions->get_selected_text(); return m_xFunctions->get_selected_text();
} }
@@ -1873,17 +1873,17 @@ SvxConfigEntry::~SvxConfigEntry()
} }
} }
bool SvxConfigEntry::IsMovable() bool SvxConfigEntry::IsMovable() const
{ {
return !IsPopup() || IsMain(); return !IsPopup() || IsMain();
} }
bool SvxConfigEntry::IsDeletable() bool SvxConfigEntry::IsDeletable() const
{ {
return !IsMain() || IsUserDefined(); return !IsMain() || IsUserDefined();
} }
bool SvxConfigEntry::IsRenamable() bool SvxConfigEntry::IsRenamable() const
{ {
return !IsMain() || IsUserDefined(); return !IsMain() || IsUserDefined();
} }

8
cui/source/customize/cfgutil.cxx
View File

@@ -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! // It's an optional interface!
css::uno::Reference< css::style::XStyleFamiliesSupplier > xModel(m_xDoc, css::uno::UNO_QUERY); css::uno::Reference< css::style::XStyleFamiliesSupplier > xModel(m_xDoc, css::uno::UNO_QUERY);
@@ -255,7 +255,7 @@ OUString CuiConfigFunctionListBox::GetHelpText( bool bConsiderParent )
return OUString(); return OUString();
} }
OUString CuiConfigFunctionListBox::GetCurCommand() OUString CuiConfigFunctionListBox::GetCurCommand() const
{ {
SfxGroupInfo_Impl *pData = reinterpret_cast<SfxGroupInfo_Impl*>(get_selected_id().toInt64()); SfxGroupInfo_Impl *pData = reinterpret_cast<SfxGroupInfo_Impl*>(get_selected_id().toInt64());
if (!pData) if (!pData)
@@ -263,7 +263,7 @@ OUString CuiConfigFunctionListBox::GetCurCommand()
return pData->sCommand; return pData->sCommand;
} }
OUString CuiConfigFunctionListBox::GetCurLabel() OUString CuiConfigFunctionListBox::GetCurLabel() const
{ {
SfxGroupInfo_Impl *pData = reinterpret_cast<SfxGroupInfo_Impl*>(get_selected_id().toInt64()); SfxGroupInfo_Impl *pData = reinterpret_cast<SfxGroupInfo_Impl*>(get_selected_id().toInt64());
if (!pData) if (!pData)
@@ -317,7 +317,7 @@ void CuiConfigFunctionListBox::ClearAll()
m_xTreeView->clear(); m_xTreeView->clear();
} }
OUString CuiConfigFunctionListBox::GetSelectedScriptURI() OUString CuiConfigFunctionListBox::GetSelectedScriptURI() const
{ {
SfxGroupInfo_Impl *pData = reinterpret_cast<SfxGroupInfo_Impl*>(get_selected_id().toInt64()); SfxGroupInfo_Impl *pData = reinterpret_cast<SfxGroupInfo_Impl*>(get_selected_id().toInt64());
if (pData && pData->nKind == SfxCfgKind::FUNCTION_SCRIPT) if (pData && pData->nKind == SfxCfgKind::FUNCTION_SCRIPT)

2
cui/source/customize/macropg.cxx
View File

@@ -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 // 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(); SvxMacroTabPage_Impl* pImpl = pThis->mpImpl.get();
weld::TreeView& rListBox = *pImpl->xEventLB; weld::TreeView& rListBox = *pImpl->xEventLB;

2
cui/source/dialogs/DiagramDialog.cxx
View File

@@ -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); auto aItems = mpDiagramData->getChildren(rParentId);
for (auto& aItem : aItems) for (auto& aItem : aItems)

10
cui/source/dialogs/SpellDialog.cxx
View File

@@ -112,18 +112,18 @@ public:
sal_uInt16 GetId() const; sal_uInt16 GetId() const;
void SetEnableChangePB(){m_bEnableChangePB = true;} void SetEnableChangePB(){m_bEnableChangePB = true;}
bool IsEnableChangePB(){return m_bEnableChangePB;} bool IsEnableChangePB() const {return m_bEnableChangePB;}
void SetEnableChangeAllPB(){m_bEnableChangeAllPB = true;} void SetEnableChangeAllPB(){m_bEnableChangeAllPB = true;}
bool IsEnableChangeAllPB(){return m_bEnableChangeAllPB;} bool IsEnableChangeAllPB() const {return m_bEnableChangeAllPB;}
void SetErrorMove(long nOldStart, long nOldEnd) void SetErrorMove(long nOldStart, long nOldEnd)
{ {
m_nOldErrorStart = nOldStart; m_nOldErrorStart = nOldStart;
m_nOldErrorEnd = nOldEnd; m_nOldErrorEnd = nOldEnd;
} }
long GetOldErrorStart() { return m_nOldErrorStart;} long GetOldErrorStart() const { return m_nOldErrorStart;}
long GetOldErrorEnd() { return m_nOldErrorEnd;} long GetOldErrorEnd() const { return m_nOldErrorEnd;}
void SetErrorLanguageSelected(bool bSet){ m_bIsErrorLanguageSelected = bSet;} void SetErrorLanguageSelected(bool bSet){ m_bIsErrorLanguageSelected = bSet;}
bool IsErrorLanguageSelected() const {return m_bIsErrorLanguageSelected;} 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); GetSpellDialog()->m_xUndoPB->set_sensitive(true);
} }
size_t SentenceEditWindow_Impl::GetUndoActionCount() size_t SentenceEditWindow_Impl::GetUndoActionCount() const
{ {
return m_xEditEngine->GetUndoManager().GetUndoActionCount(); return m_xEditEngine->GetUndoManager().GetUndoActionCount();
} }

4
cui/source/dialogs/colorpicker.cxx
View File

@@ -209,8 +209,8 @@ public:
void Modify(); void Modify();
void SetValues(Color aColor, ColorMode eMode, double x, double y); void SetValues(Color aColor, ColorMode eMode, double x, double y);
double GetX() { return mdX;} double GetX() const { return mdX;}
double GetY() { return mdY;} double GetY() const { return mdY;}
void SetModifyHdl(const Link<ColorFieldControl&,void>& rLink) { maModifyHdl = rLink; } void SetModifyHdl(const Link<ColorFieldControl&,void>& rLink) { maModifyHdl = rLink; }

2
cui/source/dialogs/hldoctp.cxx
View File

@@ -92,7 +92,7 @@ void SvxHyperlinkDocTp::FillDlgFields(const OUString& rStrURL)
|* retrieve current url-string |* retrieve current url-string
|* |*
|************************************************************************/ |************************************************************************/
OUString SvxHyperlinkDocTp::GetCurrentURL () OUString SvxHyperlinkDocTp::GetCurrentURL () const
{ {
// get data from dialog-controls // get data from dialog-controls
OUString aStrURL; OUString aStrURL;

2
cui/source/dialogs/hlmarkwn.cxx
View File

@@ -277,7 +277,7 @@ bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString& aURL)
} }
// Fill Tree-Control // 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; int nEntries=0;
const uno::Sequence< OUString > aNames( xLinks->getElementNames() ); const uno::Sequence< OUString > aNames( xLinks->getElementNames() );

2
cui/source/dialogs/hltpbase.cxx
View File

@@ -377,7 +377,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, weld::Button&, voi
} }
// Get Macro-Infos // Get Macro-Infos
HyperDialogEvent SvxHyperlinkTabPageBase::GetMacroEvents() HyperDialogEvent SvxHyperlinkTabPageBase::GetMacroEvents() const
{ {
const SvxHyperlinkItem *pHyperlinkItem = static_cast<const SvxHyperlinkItem *>( const SvxHyperlinkItem *pHyperlinkItem = static_cast<const SvxHyperlinkItem *>(
GetItemSet().GetItem (SID_HYPERLINK_GETLINK)); GetItemSet().GetItem (SID_HYPERLINK_GETLINK));

4
cui/source/dialogs/scriptdlg.cxx
View File

@@ -67,7 +67,7 @@ static void ShowErrorDialog( const Any& aException )
pDlg->Execute(); 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()); SFEntry* pUserData = reinterpret_cast<SFEntry*>(m_xScriptsBox->get_id(rIter).toInt64());
if (pUserData) 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; Reference< browse::XBrowseNode > aChildNode;

2
cui/source/dialogs/thesdlg.cxx
View File

@@ -332,7 +332,7 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage )
m_xDialog->set_title(aStr); // set window title m_xDialog->set_title(aStr); // set window title
} }
OUString SvxThesaurusDialog::GetWord() OUString SvxThesaurusDialog::GetWord() const
{ {
return m_xReplaceEdit->get_text(); return m_xReplaceEdit->get_text();
} }

2
cui/source/inc/CommandCategoryListBox.hxx
View File

@@ -70,7 +70,7 @@ public:
// Adds children of the given macro group to the functions list // Adds children of the given macro group to the functions list
void addChildren( 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, CuiConfigFunctionListBox* pFunctionListBox, const OUString &filterTerm , SaveInData *pCurrentSaveInData,
std::vector<std::unique_ptr<weld::TreeIter>> &rNodesToExpand); std::vector<std::unique_ptr<weld::TreeIter>> &rNodesToExpand);
}; };

2
cui/source/inc/DiagramDialog.hxx
View File

@@ -32,7 +32,7 @@ private:
DECL_LINK(OnAddClick, weld::Button&, void); 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 #endif // INCLUDED_CUI_SOURCE_INC_DIAGRAMDIALOG_HXX

2
cui/source/inc/FontFeaturesDialog.hxx
View File

@@ -66,7 +66,7 @@ public:
~FontFeaturesDialog() override; ~FontFeaturesDialog() override;
virtual short run() override; virtual short run() override;
OUString const& getResultFontName() { return m_sResultFontName; } OUString const& getResultFontName() const { return m_sResultFontName; }
void updateFontPreview(); void updateFontPreview();
}; };

2
cui/source/inc/SpellDialog.hxx
View File

@@ -109,7 +109,7 @@ public:
void ResetUndo(); void ResetUndo();
void Undo(); void Undo();
void AddUndoAction( std::unique_ptr<SfxUndoAction> pAction ); void AddUndoAction( std::unique_ptr<SfxUndoAction> pAction );
size_t GetUndoActionCount(); size_t GetUndoActionCount() const;
void UndoActionStart( sal_uInt16 nId ); void UndoActionStart( sal_uInt16 nId );
void UndoActionEnd(); void UndoActionEnd();

2
cui/source/inc/backgrnd.hxx
View File

@@ -141,7 +141,7 @@ private:
bool LoadLinkedGraphic_Impl(); bool LoadLinkedGraphic_Impl();
void RaiseLoadError_Impl(); void RaiseLoadError_Impl();
void SetGraphicPosition_Impl( SvxGraphicPosition ePos ); void SetGraphicPosition_Impl( SvxGraphicPosition ePos );
SvxGraphicPosition GetGraphicPosition_Impl(); SvxGraphicPosition GetGraphicPosition_Impl() const;
void FillControls_Impl(const SvxBrushItem& rBgdAttr, void FillControls_Impl(const SvxBrushItem& rBgdAttr,
const OUString& rUserData); const OUString& rUserData);

34
cui/source/inc/cfg.hxx
View File

@@ -121,26 +121,26 @@ public:
const css::uno::Reference< css::uno::XInterface >& xManager ); const css::uno::Reference< css::uno::XInterface >& xManager );
void SetModified( bool bValue = true ) { bModified = bValue; } void SetModified( bool bValue = true ) { bModified = bValue; }
bool IsModified( ) { return bModified; } bool IsModified( ) const { return bModified; }
bool IsReadOnly( ) { return bReadOnly; } bool IsReadOnly( ) const { return bReadOnly; }
bool IsDocConfig( ) { return bDocConfig; } bool IsDocConfig( ) const { return bDocConfig; }
const css::uno::Reference const css::uno::Reference
< css::ui::XUIConfigurationManager >& < css::ui::XUIConfigurationManager >&
GetConfigManager() { return m_xCfgMgr; }; GetConfigManager() const { return m_xCfgMgr; };
const css::uno::Reference const css::uno::Reference
< css::ui::XUIConfigurationManager >& < css::ui::XUIConfigurationManager >&
GetParentConfigManager() { return m_xParentCfgMgr; }; GetParentConfigManager() const { return m_xParentCfgMgr; };
const css::uno::Reference const css::uno::Reference
< css::ui::XImageManager >& < css::ui::XImageManager >&
GetImageManager() { return m_xImgMgr; }; GetImageManager() const { return m_xImgMgr; };
const css::uno::Reference const css::uno::Reference
< css::ui::XImageManager >& < css::ui::XImageManager >&
GetParentImageManager() { return m_xParentImgMgr; }; GetParentImageManager() const { return m_xParentImgMgr; };
css::uno::Reference css::uno::Reference
< css::container::XNameAccess > m_xCommandToLabelMap; < css::container::XNameAccess > m_xCommandToLabelMap;
@@ -288,17 +288,17 @@ public:
void SetEntries( std::unique_ptr<SvxEntries> entries ) { mpEntries = std::move(entries); } void SetEntries( std::unique_ptr<SvxEntries> entries ) { mpEntries = std::move(entries); }
void SetMain() { bIsMain = true; } void SetMain() { bIsMain = true; }
bool IsMain() { return bIsMain; } bool IsMain() const { return bIsMain; }
void SetParentData( bool bValue = true ) { bIsParentData = bValue; } void SetParentData( bool bValue = true ) { bIsParentData = bValue; }
bool IsParentData() { return bIsParentData; } bool IsParentData() const { return bIsParentData; }
void SetModified( bool bValue = true ) { bIsModified = bValue; } void SetModified( bool bValue = true ) { bIsModified = bValue; }
bool IsModified() { return bIsModified; } bool IsModified() const { return bIsModified; }
bool IsMovable(); bool IsMovable() const;
bool IsDeletable(); bool IsDeletable() const;
bool IsRenamable(); bool IsRenamable() const;
void SetVisible( bool b ) { bIsVisible = b; } void SetVisible( bool b ) { bIsVisible = b; }
bool IsVisible() const { return bIsVisible; } bool IsVisible() const { return bIsVisible; }
@@ -306,7 +306,7 @@ public:
void SetBackupGraphic( css::uno::Reference< css::graphic::XGraphic > const & graphic ) void SetBackupGraphic( css::uno::Reference< css::graphic::XGraphic > const & graphic )
{ xBackupGraphic = graphic; } { xBackupGraphic = graphic; }
const css::uno::Reference< css::graphic::XGraphic >& GetBackupGraphic() const css::uno::Reference< css::graphic::XGraphic >& GetBackupGraphic() const
{ return xBackupGraphic; } { return xBackupGraphic; }
sal_Int32 GetStyle() const { return nStyle; } sal_Int32 GetStyle() const { return nStyle; }
@@ -435,7 +435,7 @@ protected:
void InsertEntryIntoUI(SvxConfigEntry* pNewEntryData, void InsertEntryIntoUI(SvxConfigEntry* pNewEntryData,
int nPos, int nStartCol); 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); int nStartCol);
SvxEntries* FindParentForChild( SvxEntries* pParentEntries, SvxEntries* FindParentForChild( SvxEntries* pParentEntries,
@@ -483,7 +483,7 @@ public:
GetFrameWithDefaultAndIdentify( css::uno::Reference< css::frame::XFrame >& _inout_rxFrame ); GetFrameWithDefaultAndIdentify( css::uno::Reference< css::frame::XFrame >& _inout_rxFrame );
OUString GetScriptURL() const; OUString GetScriptURL() const;
OUString GetSelectedDisplayName(); OUString GetSelectedDisplayName() const;
}; };
class SvxMainMenuOrganizerDialog : public weld::GenericDialogController class SvxMainMenuOrganizerDialog : public weld::GenericDialogController
@@ -576,7 +576,7 @@ public:
SvxNewToolbarDialog(weld::Window* pWindow, const OUString& rName); SvxNewToolbarDialog(weld::Window* pWindow, const OUString& rName);
virtual ~SvxNewToolbarDialog() override; virtual ~SvxNewToolbarDialog() override;
OUString GetName() OUString GetName() const
{ {
return m_xEdtName->get_text(); return m_xEdtName->get_text();
} }

20
cui/source/inc/cfgutil.hxx
View File

@@ -68,7 +68,7 @@ public:
static bool parseStyleCommand(SfxStyleInfo_Impl& aStyle); static bool parseStyleCommand(SfxStyleInfo_Impl& aStyle);
void getLabel4Style(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); std::vector< SfxStyleInfo_Impl > getStyles(const OUString& sFamily);
static OUString generateCommand(const OUString& sFamily, const OUString& sStyle); 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 connect_row_activated(const Link<weld::TreeView&, void>& rLink) { m_xTreeView->connect_row_activated(rLink); }
void freeze() { m_xTreeView->freeze(); } void freeze() { m_xTreeView->freeze(); }
void thaw() { m_xTreeView->thaw(); } 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); 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()); std::unique_ptr<weld::TreeIter> xIter(m_xTreeView->make_iterator());
m_xTreeView->insert(pParent, -1, &rStr, &rId, nullptr, nullptr, nullptr, false, xIter.get()); m_xTreeView->insert(pParent, -1, &rStr, &rId, nullptr, nullptr, nullptr, false, xIter.get());
return xIter; 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); 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->insert(pParent, -1, &rStr, &rId, nullptr, nullptr, nullptr, false, m_xScratchIter.get());
m_xTreeView->set_image(*m_xScratchIter, rImage, -1); m_xTreeView->set_image(*m_xScratchIter, rImage, -1);
} }
void remove(int nPos) { m_xTreeView->remove(nPos); } void remove(int nPos) { m_xTreeView->remove(nPos); }
void scroll_to_row(int pos) { m_xTreeView->scroll_to_row(pos); } void scroll_to_row(int pos) { m_xTreeView->scroll_to_row(pos); }
void remove(weld::TreeIter& rIter) { m_xTreeView->remove(rIter); } void remove(const weld::TreeIter& rIter) { m_xTreeView->remove(rIter); }
void expand_row(weld::TreeIter& rIter) { m_xTreeView->expand_row(rIter); } void expand_row(const weld::TreeIter& rIter) { m_xTreeView->expand_row(rIter); }
int n_children() const { return m_xTreeView->n_children(); } 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); } 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); } bool get_iter_first(weld::TreeIter& rIter) const { return m_xTreeView->get_iter_first(rIter); }
@@ -171,10 +171,10 @@ public:
~CuiConfigFunctionListBox(); ~CuiConfigFunctionListBox();
void ClearAll(); void ClearAll();
OUString GetSelectedScriptURI(); OUString GetSelectedScriptURI() const;
OUString GetHelpText( bool bConsiderParent = true ); OUString GetHelpText( bool bConsiderParent = true );
OUString GetCurCommand(); OUString GetCurCommand() const;
OUString GetCurLabel(); OUString GetCurLabel() const;
}; };
struct SvxConfigGroupBoxResource_Impl; struct SvxConfigGroupBoxResource_Impl;

6
cui/source/inc/cuitabarea.hxx
View File

@@ -62,7 +62,7 @@ class ButtonBox
maButtonList.push_back(pButton); maButtonList.push_back(pButton);
maButtonToPos.insert( std::make_pair(pButton, maButtonList.size() - 1) ); 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) sal_Int32 GetButtonPos(weld::ToggleButton* pButton)
{ {
std::map<weld::ToggleButton*, sal_Int32>::const_iterator aBtnPos = maButtonToPos.find(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 ); void SelectFillType( weld::ToggleButton& rButton, const SfxItemSet* _pSet = nullptr );
SfxTabPage* GetFillTabPage() { return m_pFillTabPage; } SfxTabPage* GetFillTabPage() { return m_pFillTabPage; }
bool IsBtnClicked() { return m_bBtnClicked; } bool IsBtnClicked() const { return m_bBtnClicked; }
private: private:
DECL_LINK(SelectFillTypeHdl_Impl, weld::ToggleButton&, void); DECL_LINK(SelectFillTypeHdl_Impl, weld::ToggleButton&, void);
@@ -762,7 +762,7 @@ public:
void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } 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; virtual void FillUserData() override;
}; };

2
cui/source/inc/dlgname.hxx
View File

@@ -85,7 +85,7 @@ public:
SvxObjectNameDialog(weld::Window* pWindow, const OUString& rName); SvxObjectNameDialog(weld::Window* pWindow, const OUString& rName);
// data access // data access
OUString GetName() { return m_xEdtName->get_text(); } OUString GetName() const { return m_xEdtName->get_text(); }
// set handler // set handler
void SetCheckNameHdl(const Link<SvxObjectNameDialog&,bool>& rLink) void SetCheckNameHdl(const Link<SvxObjectNameDialog&,bool>& rLink)

2
cui/source/inc/hldoctp.hxx
View File

@@ -58,7 +58,7 @@ private:
SvxLinkInsertMode& eMode ) override; SvxLinkInsertMode& eMode ) override;
virtual bool ShouldOpenMarkWnd () override {return m_bMarkWndOpen;} virtual bool ShouldOpenMarkWnd () override {return m_bMarkWndOpen;}
virtual void SetMarkWndShouldOpen (bool bOpen) override {m_bMarkWndOpen=bOpen;} virtual void SetMarkWndShouldOpen (bool bOpen) override {m_bMarkWndOpen=bOpen;}
OUString GetCurrentURL (); OUString GetCurrentURL() const;
public: public:
SvxHyperlinkDocTp(weld::Container* pParent, SvxHpLinkDlg* pDlg, const SfxItemSet* pItemSet); SvxHyperlinkDocTp(weld::Container* pParent, SvxHpLinkDlg* pDlg, const SfxItemSet* pItemSet);

2
cui/source/inc/hlmarkwn.hxx
View File

@@ -50,7 +50,7 @@ protected:
std::unique_ptr<weld::TreeIter> FindEntry(const OUString& aStrName); std::unique_ptr<weld::TreeIter> FindEntry(const OUString& aStrName);
void ClearTree(); 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( ClickApplyHdl_Impl, weld::Button&, void );
DECL_LINK( DoubleClickApplyHdl_Impl, weld::TreeView&, void ); DECL_LINK( DoubleClickApplyHdl_Impl, weld::TreeView&, void );

2
cui/source/inc/hltpbase.hxx
View File

@@ -129,7 +129,7 @@ protected:
SfxDispatcher* GetDispatcher() const; SfxDispatcher* GetDispatcher() const;
HyperDialogEvent GetMacroEvents(); HyperDialogEvent GetMacroEvents() const;
SvxMacroTableDtor* GetMacroTable(); SvxMacroTableDtor* GetMacroTable();
}; };

2
cui/source/inc/insdlg.hxx
View File

@@ -40,7 +40,7 @@ protected:
const OUString& rUIXMLDescription, const OString& rID, const OUString& rUIXMLDescription, const OString& rID,
const css::uno::Reference < css::embed::XStorage >& xStorage); const css::uno::Reference < css::embed::XStorage >& xStorage);
public: 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); virtual css::uno::Reference<css::io::XInputStream> GetIconIfIconified(OUString* pGraphicMediaType);
void SetHelpId(const OString& rHelpId) { m_xDialog->set_help_id(rHelpId); } void SetHelpId(const OString& rHelpId) { m_xDialog->set_help_id(rHelpId); }
virtual bool IsCreateNew() const; virtual bool IsCreateNew() const;

2
cui/source/inc/macropg.hxx
View File

@@ -58,7 +58,7 @@ class SvxMacroTabPage_ : public SfxTabPage
DECL_LINK( AssignDeleteHdl_Impl, weld::Button&, void ); DECL_LINK( AssignDeleteHdl_Impl, weld::Button&, void );
DECL_LINK( DoubleClickHdl_Impl, weld::TreeView&, 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; css::uno::Reference< css::container::XNameReplace > m_xAppEvents;
protected: protected:

2
cui/source/inc/optdict.hxx
View File

@@ -50,7 +50,7 @@ private:
public: public:
SvxNewDictionaryDialog(weld::Window* pParent); 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 ----------------------------------------- // class SvxEditDictionaryDialog -----------------------------------------

2
cui/source/inc/page.hxx
View File

@@ -158,7 +158,7 @@ private:
bool IsPrinterRangeOverflow(weld::MetricSpinButton& rField, long nFirstMargin, bool IsPrinterRangeOverflow(weld::MetricSpinButton& rField, long nFirstMargin,
long nLastMargin, MarginPosition nPos); long nLastMargin, MarginPosition nPos);
void CheckMarginEdits( bool _bClear ); void CheckMarginEdits( bool _bClear );
bool IsMarginOutOfRange(); bool IsMarginOutOfRange() const;
SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rSet); SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rSet);

4
cui/source/inc/postdlg.hxx
View File

@@ -42,7 +42,7 @@ public:
virtual ~SvxPostItDialog() override; virtual ~SvxPostItDialog() override;
static const sal_uInt16* GetRanges(); 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 ) void SetPrevHdl( const Link<SvxPostItDialog&,void>& rLink )
{ m_aPrevHdlLink = rLink; } { m_aPrevHdlLink = rLink; }
@@ -71,7 +71,7 @@ public:
{ {
m_xDialog->set_title(rTitle); m_xDialog->set_title(rTitle);
} }
std::shared_ptr<weld::Dialog> const & GetDialog() std::shared_ptr<weld::Dialog> const & GetDialog() const
{ {
return m_xDialog; return m_xDialog;
} }

8
cui/source/inc/scriptdlg.hxx
View File

@@ -70,8 +70,8 @@ public:
SFEntry( const css::uno::Reference< css::script::browse::XBrowseNode >& entryNodes , SFEntry( const css::uno::Reference< css::script::browse::XBrowseNode >& entryNodes ,
const css::uno::Reference< css::frame::XModel >& entryModel) { nodes = entryNodes; loaded=false; model = entryModel; } const css::uno::Reference< css::frame::XModel >& entryModel) { nodes = entryNodes; loaded=false; model = entryModel; }
SFEntry( const SFEntry& r ) { nodes = r.nodes; loaded = r.loaded; } 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::script::browse::XBrowseNode >& GetNode() const { return nodes ;}
const css::uno::Reference< css::frame::XModel >& GetModel() { return model ;}; const css::uno::Reference< css::frame::XModel >& GetModel() const { return model ;};
bool isLoaded() const { return loaded; } bool isLoaded() const { return loaded; }
void setLoaded() { loaded=true; } void setLoaded() { loaded=true; }
}; };
@@ -108,7 +108,7 @@ protected:
void CheckButtons( css::uno::Reference< css::script::browse::XBrowseNode > const & node ); void CheckButtons( css::uno::Reference< css::script::browse::XBrowseNode > const & node );
void createEntry(weld::TreeIter& rEntry); void createEntry(weld::TreeIter& rEntry);
void renameEntry(weld::TreeIter& rEntry); void renameEntry(const weld::TreeIter& rEntry);
void deleteEntry(weld::TreeIter& rEntry); void deleteEntry(weld::TreeIter& rEntry);
css::uno::Reference<css::script::browse::XBrowseNode> getBrowseNode(const 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); css::uno::Reference<css::frame::XModel> getModel(const weld::TreeIter& rEntry);
@@ -117,7 +117,7 @@ protected:
void RestorePreviousSelection(); void RestorePreviousSelection();
void Init(const OUString& language); void Init(const OUString& language);
void delUserData(weld::TreeIter& rIter); void delUserData(const weld::TreeIter& rIter);
void deleteTree(weld::TreeIter& rIter); void deleteTree(weld::TreeIter& rIter);
void deleteAllTree(); void deleteAllTree();
void insertEntry(OUString const & rText, OUString const & rBitmap, void insertEntry(OUString const & rText, OUString const & rBitmap,

8
cui/source/inc/srchxtra.hxx
View File

@@ -73,10 +73,10 @@ public:
sal_uInt16 nLonger); sal_uInt16 nLonger);
virtual ~SvxSearchSimilarityDialog() override; virtual ~SvxSearchSimilarityDialog() override;
sal_uInt16 GetOther() { return static_cast<sal_uInt16>(m_xOtherFld->get_value()); } sal_uInt16 GetOther() const { return static_cast<sal_uInt16>(m_xOtherFld->get_value()); }
sal_uInt16 GetShorter() { return static_cast<sal_uInt16>(m_xShorterFld->get_value()); } sal_uInt16 GetShorter() const { return static_cast<sal_uInt16>(m_xShorterFld->get_value()); }
sal_uInt16 GetLonger() { return static_cast<sal_uInt16>(m_xLongerFld->get_value()); } sal_uInt16 GetLonger() const { return static_cast<sal_uInt16>(m_xLongerFld->get_value()); }
bool IsRelaxed() { return m_xRelaxBox->get_active(); } bool IsRelaxed() const { return m_xRelaxBox->get_active(); }
}; };
#endif #endif

2
cui/source/inc/textanim.hxx
View File

@@ -75,7 +75,7 @@ private:
DECL_LINK( ClickDirectionHdl_Impl, weld::Button&, void ); DECL_LINK( ClickDirectionHdl_Impl, weld::Button&, void );
void SelectDirection( SdrTextAniDirection nValue ); void SelectDirection( SdrTextAniDirection nValue );
sal_uInt16 GetSelectedDirection(); sal_uInt16 GetSelectedDirection() const;
public: public:
SvxTextAnimationPage(TabPageParent pPage, const SfxItemSet& rInAttrs); SvxTextAnimationPage(TabPageParent pPage, const SfxItemSet& rInAttrs);

2
cui/source/inc/thesdlg.hxx
View File

@@ -74,7 +74,7 @@ public:
css::uno::Reference< css::linguistic2::XThesaurus > const & xThesaurus, css::uno::Reference< css::linguistic2::XThesaurus > const & xThesaurus,
const OUString &rWord, LanguageType nLanguage); const OUString &rWord, LanguageType nLanguage);
void SetWindowTitle( LanguageType nLanguage ); void SetWindowTitle( LanguageType nLanguage );
OUString GetWord(); OUString GetWord() const;
}; };
#endif #endif

2
cui/source/options/optaboutconfig.hxx
View File

@@ -77,7 +77,7 @@ public:
CuiAboutConfigValueDialog(weld::Window* pWindow, const OUString& rValue , int limit); CuiAboutConfigValueDialog(weld::Window* pWindow, const OUString& rValue , int limit);
virtual ~CuiAboutConfigValueDialog() override; virtual ~CuiAboutConfigValueDialog() override;
OUString getValue() OUString getValue() const
{ {
return m_xEDValue->get_text(); return m_xEDValue->get_text();
} }

2
cui/source/options/optcolor.cxx
View File

@@ -786,7 +786,7 @@ public:
void SetConfig (EditableColorConfig& rConfig) { pColorConfig = &rConfig; } void SetConfig (EditableColorConfig& rConfig) { pColorConfig = &rConfig; }
void SetExtendedConfig (EditableExtendedColorConfig& rConfig) { pExtColorConfig = &rConfig; } void SetExtendedConfig (EditableExtendedColorConfig& rConfig) { pExtColorConfig = &rConfig; }
void Update (); void Update ();
long GetScrollPosition () long GetScrollPosition () const
{ {
return m_pVScroll->GetThumbPos(); return m_pVScroll->GetThumbPos();
} }

2
cui/source/tabpages/backgrnd.cxx
View File

@@ -912,7 +912,7 @@ void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos )
m_xWndPosition->Invalidate(); m_xWndPosition->Invalidate();
} }
SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl() SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl() const
{ {
if (m_xBtnTile->get_active()) if (m_xBtnTile->get_active())
return GPOS_TILED; return GPOS_TILED;

2
cui/source/tabpages/page.cxx
View File

@@ -1502,7 +1502,7 @@ void SvxPageDescPage::CheckMarginEdits( bool _bClear )
m_nPos |= MARGIN_BOTTOM; m_nPos |= MARGIN_BOTTOM;
} }
bool SvxPageDescPage::IsMarginOutOfRange() bool SvxPageDescPage::IsMarginOutOfRange() const
{ {
bool bRet = ( ( ( !( m_nPos & MARGIN_LEFT ) && bool bRet = ( ( ( !( m_nPos & MARGIN_LEFT ) &&
m_xLeftMarginEdit->get_value_changed_from_saved() ) && m_xLeftMarginEdit->get_value_changed_from_saved() ) &&

2
cui/source/tabpages/textanim.cxx
View File

@@ -517,7 +517,7 @@ void SvxTextAnimationPage::SelectDirection( SdrTextAniDirection nValue )
m_xBtnDown->set_active( nValue == SdrTextAniDirection::Down ); m_xBtnDown->set_active( nValue == SdrTextAniDirection::Down );
} }
sal_uInt16 SvxTextAnimationPage::GetSelectedDirection() sal_uInt16 SvxTextAnimationPage::GetSelectedDirection() const
{ {
SdrTextAniDirection nValue = SdrTextAniDirection::Left; SdrTextAniDirection nValue = SdrTextAniDirection::Left;

2
cui/source/tabpages/tppattern.cxx
View File

@@ -57,7 +57,7 @@ public:
} }
// BitmapCtl: Returns the Bitmap // BitmapCtl: Returns the Bitmap
BitmapEx GetBitmapEx() BitmapEx GetBitmapEx() const
{ {
if (!pBmpArray) if (!pBmpArray)
return BitmapEx(); return BitmapEx();