diff options
Diffstat (limited to 'cui/source/customize')
-rw-r--r-- | cui/source/customize/CommandCategoryListBox.cxx | 2 | ||||
-rw-r--r-- | cui/source/customize/CustomNotebookbarGenerator.cxx | 2 | ||||
-rw-r--r-- | cui/source/customize/SvxNotebookbarConfigPage.cxx | 13 | ||||
-rw-r--r-- | cui/source/customize/cfg.cxx | 8 | ||||
-rw-r--r-- | cui/source/customize/cfgutil.cxx | 8 | ||||
-rw-r--r-- | cui/source/customize/macropg.cxx | 2 |
6 files changed, 18 insertions, 17 deletions
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; |