include/sfx2/listview.hxx | 6 include/sfx2/templatedlg.hxx | 2 sfx2/source/control/templatedlglocalview.cxx | 10 - sfx2/source/doc/templatedlg.cxx | 180 +++++++++++++-------------- 4 files changed, 99 insertions(+), 99 deletions(-)
New commits: commit 9d767723589711967d42acc460a18455651cee41 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Jan 13 00:10:03 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Jan 13 21:42:15 2026 +0100 sfx2: Make TemplateViewMode an enum class ... and drop the "e" prefix from the enum value names. Change-Id: I355a1e16bb6954d3d184b561779049ea6bc81091 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197160 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/sfx2/listview.hxx b/include/sfx2/listview.hxx index 3c63b815876d..2991d4e92316 100644 --- a/include/sfx2/listview.hxx +++ b/include/sfx2/listview.hxx @@ -12,10 +12,10 @@ #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> -enum TemplateViewMode +enum class TemplateViewMode { - eListView, - eThumbnailView + ListView, + ThumbnailView }; struct ListViewItem; diff --git a/sfx2/source/control/templatedlglocalview.cxx b/sfx2/source/control/templatedlglocalview.cxx index fa6c6eea09b0..17e4dcb6de66 100644 --- a/sfx2/source/control/templatedlglocalview.cxx +++ b/sfx2/source/control/templatedlglocalview.cxx @@ -27,7 +27,7 @@ TemplateDlgLocalView::TemplateDlgLocalView(std::unique_ptr<weld::ScrolledWindow> std::unique_ptr<weld::TreeView> xTreeView) : TemplateLocalView(std::move(xWindow), std::move(xMenu)) , ListView(std::move(xTreeView)) - , mViewMode(TemplateViewMode::eThumbnailView) + , mViewMode(TemplateViewMode::ThumbnailView) { mxTreeView->connect_row_activated(LINK(this, TemplateDlgLocalView, RowActivatedHdl)); mxTreeView->connect_column_clicked(LINK(this, ListView, ColumnClickedHdl)); @@ -135,13 +135,13 @@ void TemplateDlgLocalView::createContextMenu(const bool bIsDefault, const bool b mxContextMenu->set_sensitive(u"rename"_ustr, false); mxContextMenu->set_sensitive(u"delete"_ustr, false); } - if (mViewMode == TemplateViewMode::eThumbnailView) + if (mViewMode == TemplateViewMode::ThumbnailView) { ContextMenuSelectHdl(mxContextMenu->popup_at_rect( GetDrawingArea(), tools::Rectangle(maPosition, Size(1, 1)))); Invalidate(); } - else if (mViewMode == TemplateViewMode::eListView) + else if (mViewMode == TemplateViewMode::ListView) ContextMenuSelectHdl(mxContextMenu->popup_at_rect( mxTreeView.get(), tools::Rectangle(maPosition, Size(1, 1)))); } @@ -242,7 +242,7 @@ void TemplateDlgLocalView::setTemplateViewMode(TemplateViewMode eMode) { mViewMo void TemplateDlgLocalView::Show() { - if (mViewMode == TemplateViewMode::eListView) + if (mViewMode == TemplateViewMode::ListView) { ThumbnailView::Hide(); ListView::ShowListView(); @@ -267,7 +267,7 @@ bool TemplateDlgLocalView::IsVisible() const void TemplateDlgLocalView::syncCursor() { - if (mViewMode == TemplateViewMode::eListView) + if (mViewMode == TemplateViewMode::ListView) { ListView::unselect_all(); int nIndex = -1; diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index f2af79782b57..cb4df13b4a66 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -167,7 +167,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(weld::Window *pParent) , mxLocalViewWeld(new weld::CustomWeld(*m_xBuilder, u"template_view"_ustr, maLocalView)) , mxListViewButton(m_xBuilder->weld_toggle_button(u"list_view_btn"_ustr)) , mxThumbnailViewButton(m_xBuilder->weld_toggle_button(u"thumbnail_view_btn"_ustr)) - , mViewMode(TemplateViewMode::eThumbnailView) + , mViewMode(TemplateViewMode::ThumbnailView) { // Create popup menus mxActionBar->append_item(MNI_ACTION_NEW_FOLDER, SfxResId(STR_CATEGORY_NEW), BMP_ACTION_NEW_CATEGORY); @@ -287,7 +287,7 @@ void SfxTemplateManagerDlg::setDocumentModel(const uno::Reference<frame::XModel> void SfxTemplateManagerDlg::setTemplateViewMode(TemplateViewMode eViewMode) { - if(eViewMode == TemplateViewMode::eThumbnailView && mViewMode != TemplateViewMode::eThumbnailView) + if (eViewMode == TemplateViewMode::ThumbnailView && mViewMode != TemplateViewMode::ThumbnailView) { mxThumbnailViewButton->set_active(true); mxListViewButton->set_active(false); @@ -296,7 +296,7 @@ void SfxTemplateManagerDlg::setTemplateViewMode(TemplateViewMode eViewMode) maLocalView.setTemplateViewMode(eViewMode); maLocalView.Show(); } - if(eViewMode == TemplateViewMode::eListView && mViewMode != TemplateViewMode::eListView) + if (eViewMode == TemplateViewMode::ListView && mViewMode != TemplateViewMode::ListView) { mxListViewButton->set_active(true); mxThumbnailViewButton->set_active(false); @@ -439,8 +439,8 @@ void SfxTemplateManagerDlg::readSettings () mxActionBar->set_item_sensitive(MNI_ACTION_DELETE_FOLDER, !bIsBuiltInRegion); } - if(nViewMode == static_cast<sal_Int16>(TemplateViewMode::eListView) || - nViewMode == static_cast<sal_Int16>(TemplateViewMode::eThumbnailView)) + if (nViewMode == static_cast<sal_Int16>(TemplateViewMode::ListView) + || nViewMode == static_cast<sal_Int16>(TemplateViewMode::ThumbnailView)) { TemplateViewMode eViewMode = static_cast<TemplateViewMode>(nViewMode); setTemplateViewMode(eViewMode); @@ -448,7 +448,7 @@ void SfxTemplateManagerDlg::readSettings () else { //Default ViewMode - setTemplateViewMode(TemplateViewMode::eThumbnailView); + setTemplateViewMode(TemplateViewMode::ThumbnailView); } } @@ -804,12 +804,12 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, LoseFocusHdl, weld::Widget&, void) IMPL_LINK_NOARG ( SfxTemplateManagerDlg, ListViewHdl, weld::Toggleable&, void ) { - setTemplateViewMode(TemplateViewMode::eListView); + setTemplateViewMode(TemplateViewMode::ListView); } IMPL_LINK_NOARG ( SfxTemplateManagerDlg, ThumbnailViewHdl, weld::Toggleable&, void ) { - setTemplateViewMode(TemplateViewMode::eThumbnailView); + setTemplateViewMode(TemplateViewMode::ThumbnailView); bMakeSelItemVisible = true; } @@ -1344,7 +1344,7 @@ short SfxTemplateSelectionDlg::run() maIdle.SetPriority(TaskPriority::LOWEST); maIdle.SetInvokeHandler(LINK(this,SfxTemplateSelectionDlg,TimeOut)); maIdle.Start(); - setTemplateViewMode(TemplateViewMode::eThumbnailView); + setTemplateViewMode(TemplateViewMode::ThumbnailView); return weld::GenericDialogController::run(); } commit f49966a35a11c54fba30f02d6de9a1bb9b2cb89f Author: Michael Weghorn <[email protected]> AuthorDate: Mon Jan 12 23:14:03 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Jan 13 21:42:08 2026 +0100 sfx2: Don't allocate TemplateDlgLocalView on heap There is no need to use a std::unique_ptr and allocate SfxTemplateManagerDlg::mxLocalView on the heap. Stop doing so, and rename the member accordingly. Change-Id: I56b9c491ac2f1eba1b6d67e9b619d2f465988a45 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197159 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 263cd55e398a..f5e46a01440b 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -131,7 +131,7 @@ protected: std::unique_ptr<weld::Button> mxOKButton; std::unique_ptr<weld::CheckButton> mxCBXHideDlg; std::unique_ptr<weld::MenuButton> mxActionBar; - std::unique_ptr<TemplateDlgLocalView> mxLocalView; + TemplateDlgLocalView maLocalView; std::unique_ptr<weld::CustomWeld> mxLocalViewWeld; std::unique_ptr<weld::Toggleable> mxListViewButton; std::unique_ptr<weld::Toggleable> mxThumbnailViewButton; diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 294ad7bee074..f2af79782b57 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -161,10 +161,10 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(weld::Window *pParent) , mxOKButton(m_xBuilder->weld_button(u"ok"_ustr)) , mxCBXHideDlg(m_xBuilder->weld_check_button(u"hidedialogcb"_ustr)) , mxActionBar(m_xBuilder->weld_menu_button(u"action_menu"_ustr)) - , mxLocalView(new TemplateDlgLocalView(m_xBuilder->weld_scrolled_window(u"scrolllocal"_ustr, true), - m_xBuilder->weld_menu(u"contextmenu"_ustr), - m_xBuilder->weld_tree_view(u"tree_list"_ustr))) - , mxLocalViewWeld(new weld::CustomWeld(*m_xBuilder, u"template_view"_ustr, *mxLocalView)) + , maLocalView(m_xBuilder->weld_scrolled_window(u"scrolllocal"_ustr, true), + m_xBuilder->weld_menu(u"contextmenu"_ustr), + m_xBuilder->weld_tree_view(u"tree_list"_ustr)) + , mxLocalViewWeld(new weld::CustomWeld(*m_xBuilder, u"template_view"_ustr, maLocalView)) , mxListViewButton(m_xBuilder->weld_toggle_button(u"list_view_btn"_ustr)) , mxThumbnailViewButton(m_xBuilder->weld_toggle_button(u"thumbnail_view_btn"_ustr)) , mViewMode(TemplateViewMode::eThumbnailView) @@ -187,22 +187,22 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(weld::Window *pParent) mxActionBar->set_help_id(u"HID_SFX_TEMPLATE_MANAGER_ACTION_MENU"_ustr); - mxLocalView->setItemMaxTextLength(TEMPLATE_ITEM_MAX_TEXT_LENGTH); - mxLocalView->setItemDimensions(TEMPLATE_ITEM_MAX_WIDTH,TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT, - TEMPLATE_ITEM_MAX_HEIGHT-TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT, - TEMPLATE_ITEM_PADDING); + maLocalView.setItemMaxTextLength(TEMPLATE_ITEM_MAX_TEXT_LENGTH); + maLocalView.setItemDimensions(TEMPLATE_ITEM_MAX_WIDTH, TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT, + TEMPLATE_ITEM_MAX_HEIGHT - TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT, + TEMPLATE_ITEM_PADDING); - mxLocalView->setItemStateHdl(LINK(this,SfxTemplateManagerDlg,TVItemStateHdl)); - mxLocalView->setCreateContextMenuHdl(LINK(this,SfxTemplateManagerDlg, CreateContextMenuHdl)); - mxLocalView->setOpenRegionHdl(LINK(this,SfxTemplateManagerDlg, OpenRegionHdl)); - mxLocalView->setOpenTemplateHdl(LINK(this,SfxTemplateManagerDlg, OpenTemplateHdl)); - mxLocalView->setEditTemplateHdl(LINK(this,SfxTemplateManagerDlg, EditTemplateHdl)); - mxLocalView->setDeleteTemplateHdl(LINK(this,SfxTemplateManagerDlg, DeleteTemplateHdl)); - mxLocalView->setDefaultTemplateHdl(LINK(this,SfxTemplateManagerDlg, DefaultTemplateHdl)); - mxLocalView->setMoveTemplateHdl(LINK(this,SfxTemplateManagerDlg, MoveTemplateHdl)); - mxLocalView->setExportTemplateHdl(LINK(this,SfxTemplateManagerDlg, ExportTemplateHdl)); + maLocalView.setItemStateHdl(LINK(this, SfxTemplateManagerDlg, TVItemStateHdl)); + maLocalView.setCreateContextMenuHdl(LINK(this, SfxTemplateManagerDlg, CreateContextMenuHdl)); + maLocalView.setOpenRegionHdl(LINK(this, SfxTemplateManagerDlg, OpenRegionHdl)); + maLocalView.setOpenTemplateHdl(LINK(this, SfxTemplateManagerDlg, OpenTemplateHdl)); + maLocalView.setEditTemplateHdl(LINK(this, SfxTemplateManagerDlg, EditTemplateHdl)); + maLocalView.setDeleteTemplateHdl(LINK(this, SfxTemplateManagerDlg, DeleteTemplateHdl)); + maLocalView.setDefaultTemplateHdl(LINK(this, SfxTemplateManagerDlg, DefaultTemplateHdl)); + maLocalView.setMoveTemplateHdl(LINK(this, SfxTemplateManagerDlg, MoveTemplateHdl)); + maLocalView.setExportTemplateHdl(LINK(this, SfxTemplateManagerDlg, ExportTemplateHdl)); - mxLocalView->ShowTooltips(true); + maLocalView.ShowTooltips(true); // Set width and height of the templates thumbnail viewer to accommodate 3 rows and 4 columns of items mxLocalViewWeld->set_size_request(TEMPLATE_ITEM_MAX_WIDTH * 5, TEMPLATE_ITEM_MAX_HEIGHT_SUB * 3); @@ -219,8 +219,8 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(weld::Window *pParent) mxActionBar->show(); - mxLocalView->Populate(); - mxLocalView->filterItems(ViewFilter_Application(FILTER_APPLICATION::NONE)); + maLocalView.Populate(); + maLocalView.filterItems(ViewFilter_Application(FILTER_APPLICATION::NONE)); mxCBApp->set_active(0); fillFolderComboBox(); @@ -234,12 +234,12 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(weld::Window *pParent) mxCBApp->connect_changed(LINK(this, SfxTemplateManagerDlg, SelectApplicationHdl)); mxCBFolder->connect_changed(LINK(this, SfxTemplateManagerDlg, SelectRegionHdl)); - mxLocalView->Show(); + maLocalView.Show(); m_aUpdateDataTimer.SetInvokeHandler(LINK(this, SfxTemplateManagerDlg, ImplUpdateDataHdl)); m_aUpdateDataTimer.SetTimeout(EDIT_UPDATEDATA_TIMEOUT); - mxLocalView->connect_focus_rect(LINK(this, SfxTemplateManagerDlg, FocusRectLocalHdl)); + maLocalView.connect_focus_rect(LINK(this, SfxTemplateManagerDlg, FocusRectLocalHdl)); bMakeSelItemVisible = false; } @@ -248,9 +248,9 @@ SfxTemplateManagerDlg::~SfxTemplateManagerDlg() writeSettings(); // Ignore view events since we are cleaning the object - mxLocalView->setItemStateHdl(Link<const ThumbnailViewItem*,void>()); - mxLocalView->setOpenRegionHdl(Link<void*,void>()); - mxLocalView->setOpenTemplateHdl(Link<const OUString&, void>()); + maLocalView.setItemStateHdl(Link<const ThumbnailViewItem*, void>()); + maLocalView.setOpenRegionHdl(Link<void*, void>()); + maLocalView.setOpenTemplateHdl(Link<const OUString&, void>()); } short SfxTemplateManagerDlg::run() @@ -291,19 +291,19 @@ void SfxTemplateManagerDlg::setTemplateViewMode(TemplateViewMode eViewMode) { mxThumbnailViewButton->set_active(true); mxListViewButton->set_active(false); - mxLocalView->ThumbnailView::GrabFocus(); + maLocalView.ThumbnailView::GrabFocus(); mViewMode = eViewMode; - mxLocalView->setTemplateViewMode(eViewMode); - mxLocalView->Show(); + maLocalView.setTemplateViewMode(eViewMode); + maLocalView.Show(); } if(eViewMode == TemplateViewMode::eListView && mViewMode != TemplateViewMode::eListView) { mxListViewButton->set_active(true); mxThumbnailViewButton->set_active(false); - mxLocalView->ListView::grab_focus(); + maLocalView.ListView::grab_focus(); mViewMode = eViewMode; - mxLocalView->setTemplateViewMode(eViewMode); - mxLocalView->Show(); + maLocalView.setTemplateViewMode(eViewMode); + maLocalView.Show(); } } @@ -331,7 +331,7 @@ FILTER_APPLICATION SfxTemplateManagerDlg::getCurrentApplicationFilter() const void SfxTemplateManagerDlg::fillFolderComboBox() { - std::vector<OUString> aFolderNames = mxLocalView->getFolderNames(); + std::vector<OUString> aFolderNames = maLocalView.getFolderNames(); for (size_t i = 0, n = aFolderNames.size(); i < n; ++i) mxCBFolder->append_text(aFolderNames[i]); @@ -348,8 +348,8 @@ void SfxTemplateManagerDlg::getApplicationSpecificSettings() mxCBFolder->set_active(0); mxActionBar->set_item_sensitive(MNI_ACTION_RENAME_FOLDER, false); mxActionBar->set_item_sensitive(MNI_ACTION_DELETE_FOLDER, false); - mxLocalView->filterItems(ViewFilter_Application(getCurrentApplicationFilter())); - mxLocalView->showAllTemplates(); + maLocalView.filterItems(ViewFilter_Application(getCurrentApplicationFilter())); + maLocalView.showAllTemplates(); return; } @@ -376,11 +376,11 @@ void SfxTemplateManagerDlg::getApplicationSpecificSettings() break; } - mxLocalView->filterItems(ViewFilter_Application(getCurrentApplicationFilter())); + maLocalView.filterItems(ViewFilter_Application(getCurrentApplicationFilter())); mxCBFolder->set_active(0); mxActionBar->set_item_sensitive(MNI_ACTION_RENAME_FOLDER, false); mxActionBar->set_item_sensitive(MNI_ACTION_DELETE_FOLDER, false); - mxLocalView->showAllTemplates(); + maLocalView.showAllTemplates(); } void SfxTemplateManagerDlg::readSettings () @@ -420,7 +420,7 @@ void SfxTemplateManagerDlg::readSettings () } } - mxLocalView->filterItems(ViewFilter_Application(getCurrentApplicationFilter())); + maLocalView.filterItems(ViewFilter_Application(getCurrentApplicationFilter())); if (aLastFolder.isEmpty()) { @@ -428,13 +428,13 @@ void SfxTemplateManagerDlg::readSettings () mxCBFolder->set_active(0); mxActionBar->set_item_sensitive(MNI_ACTION_RENAME_FOLDER, false); mxActionBar->set_item_sensitive(MNI_ACTION_DELETE_FOLDER, false); - mxLocalView->showAllTemplates(); + maLocalView.showAllTemplates(); } else { mxCBFolder->set_active_text(aLastFolder); - mxLocalView->showRegion(aLastFolder); - bool bIsBuiltInRegion = mxLocalView->IsBuiltInRegion(aLastFolder); + maLocalView.showRegion(aLastFolder); + bool bIsBuiltInRegion = maLocalView.IsBuiltInRegion(aLastFolder); mxActionBar->set_item_sensitive(MNI_ACTION_RENAME_FOLDER, !bIsBuiltInRegion); mxActionBar->set_item_sensitive(MNI_ACTION_DELETE_FOLDER, !bIsBuiltInRegion); } @@ -456,8 +456,8 @@ void SfxTemplateManagerDlg::writeSettings () { OUString aLastFolder; - if (mxLocalView->getCurRegionId()) - aLastFolder = mxLocalView->getRegionName(mxLocalView->getCurRegionId()-1); + if (maLocalView.getCurRegionId()) + aLastFolder = maLocalView.getRegionName(maLocalView.getCurRegionId() - 1); // last folder Sequence< NamedValue > aSettings @@ -474,7 +474,7 @@ void SfxTemplateManagerDlg::writeSettings () IMPL_LINK_NOARG(SfxTemplateManagerDlg, SelectApplicationHdl, weld::ComboBox&, void) { - mxLocalView->filterItems(ViewFilter_Application(getCurrentApplicationFilter())); + maLocalView.filterItems(ViewFilter_Application(getCurrentApplicationFilter())); SelectRegionHdl(*mxCBFolder); updateMenuItems(); } @@ -490,7 +490,7 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, SelectRegionHdl, weld::ComboBox&, void) } else { - bool bIsBuiltInRegion = mxLocalView->IsBuiltInRegion(sSelectedRegion); + bool bIsBuiltInRegion = maLocalView.IsBuiltInRegion(sSelectedRegion); mxActionBar->set_item_sensitive(MNI_ACTION_RENAME_FOLDER, !bIsBuiltInRegion); mxActionBar->set_item_sensitive(MNI_ACTION_DELETE_FOLDER, !bIsBuiltInRegion); } @@ -546,11 +546,11 @@ void SfxTemplateManagerDlg::DefaultTemplateMenuSelectHdl(std::u16string_view rId OUString sPrevDefault = SfxObjectFactory::GetStandardTemplate( aServiceName ); if(!sPrevDefault.isEmpty()) { - mxLocalView->RemoveDefaultTemplateIcon(sPrevDefault); + maLocalView.RemoveDefaultTemplateIcon(sPrevDefault); } SfxObjectFactory::SetStandardTemplate( aServiceName, OUString() ); - mxLocalView->refreshDefaultColumn(); + maLocalView.refreshDefaultColumn(); updateMenuItems(); } @@ -564,7 +564,7 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, MoveTemplateHdl, void*, void) { // modal dialog to select templates category SfxTemplateCategoryDialog aDlg(m_xDialog.get()); - aDlg.SetCategoryLBEntries(mxLocalView->getFolderNames()); + aDlg.SetCategoryLBEntries(maLocalView.getFolderNames()); size_t nItemId = 0; @@ -577,20 +577,20 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, MoveTemplateHdl, void*, void) { if (!sCategory.isEmpty()) { - nItemId = mxLocalView->createRegion(sCategory); + nItemId = maLocalView.createRegion(sCategory); if(nItemId) mxCBFolder->append_text(sCategory); } } else - nItemId = mxLocalView->getRegionId(sCategory); + nItemId = maLocalView.getRegionId(sCategory); if(nItemId) { localMoveTo(nItemId); } - mxLocalView->reload(); + maLocalView.reload(); SearchUpdate(); } IMPL_LINK_NOARG(SfxTemplateManagerDlg, ExportTemplateHdl, void*, void) @@ -604,7 +604,7 @@ void SfxTemplateManagerDlg::ImportActionHdl() { //Modal Dialog to select Category SfxTemplateCategoryDialog aDlg(m_xDialog.get()); - aDlg.SetCategoryLBEntries(mxLocalView->getFolderNames()); + aDlg.SetCategoryLBEntries(maLocalView.getFolderNames()); if (aDlg.run() == RET_OK) { @@ -612,7 +612,7 @@ void SfxTemplateManagerDlg::ImportActionHdl() bool bIsNewCategory = aDlg.IsNewCategoryCreated(); if(bIsNewCategory) { - if(mxLocalView->createRegion(sCategory)) + if (maLocalView.createRegion(sCategory)) { mxCBFolder->append_text(sCategory); OnTemplateImportCategory(sCategory); @@ -636,7 +636,7 @@ void SfxTemplateManagerDlg::ImportActionHdl() const auto sCategory = mxCBFolder->get_active_text(); OnTemplateImportCategory(sCategory); } - mxLocalView->reload(); + maLocalView.reload(); SearchUpdate(); } @@ -683,7 +683,7 @@ IMPL_LINK(SfxTemplateManagerDlg, CreateContextMenuHdl, TemplateViewItem*, pItem, aDefaultImg = BMP_ACTION_DEFAULT_IMPRESS; else if (ViewFilter_Application::isFilteredExtension(FILTER_APPLICATION::DRAW, aUrl.getExtension())) aDefaultImg = BMP_ACTION_DEFAULT_DRAW; - mxLocalView->createContextMenu(bIsDefault, bIsInternal, bIsSingleSel, aDefaultImg); + maLocalView.createContextMenu(bIsDefault, bIsInternal, bIsSingleSel, aDefaultImg); } IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, const OUString&, rTemplatePath, void) @@ -735,9 +735,9 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, DeleteTemplateHdl, void*, void) for (auto const& pItem : aSelTemplates) { - sal_uInt16 nRegionItemId = mxLocalView->getRegionId(pItem->mnRegionId); + sal_uInt16 nRegionItemId = maLocalView.getRegionId(pItem->mnRegionId); - if (!mxLocalView->removeTemplate(pItem->mnDocId + 1, nRegionItemId))//mnId w.r.t. region is mnDocId + 1; + if (!maLocalView.removeTemplate(pItem->mnDocId + 1, nRegionItemId)) //mnId w.r.t. region is mnDocId + 1; { aDeletedTemplate += pItem->maTitle+" "; } @@ -765,7 +765,7 @@ IMPL_LINK(SfxTemplateManagerDlg, DefaultTemplateHdl, ThumbnailViewItem*, pItem, OUString sPrevDefault = SfxObjectFactory::GetStandardTemplate( aServiceName ); if(!sPrevDefault.isEmpty()) { - mxLocalView->RemoveDefaultTemplateIcon(sPrevDefault); + maLocalView.RemoveDefaultTemplateIcon(sPrevDefault); } SfxObjectFactory::SetStandardTemplate(aServiceName,pViewItem->getPath()); pViewItem->showDefaultIcon(true); @@ -816,7 +816,7 @@ IMPL_LINK_NOARG ( SfxTemplateManagerDlg, ThumbnailViewHdl, weld::Toggleable&, vo IMPL_LINK_NOARG(SfxTemplateManagerDlg, FocusRectLocalHdl, weld::Widget&, tools::Rectangle) { if(bMakeSelItemVisible && !maSelTemplates.empty()) - mxLocalView->MakeItemVisible((*maSelTemplates.begin())->mnId); + maLocalView.MakeItemVisible((*maSelTemplates.begin())->mnId); bMakeSelItemVisible = false; return tools::Rectangle(); } @@ -824,23 +824,23 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, FocusRectLocalHdl, weld::Widget&, tools:: void SfxTemplateManagerDlg::SearchUpdate() { const OUString sSelectedRegion = mxCBFolder->get_active_text(); - mxLocalView->setCurRegionId(mxLocalView->getRegionId(sSelectedRegion)); + maLocalView.setCurRegionId(maLocalView.getRegionId(sSelectedRegion)); OUString aKeyword = mxSearchFilter->get_text(); - mxLocalView->Clear(); + maLocalView.Clear(); std::function<bool(const TemplateItemProperties &)> aFunc = [&](const TemplateItemProperties &rItem)->bool { return aKeyword.isEmpty() || SearchView_Keyword(aKeyword, getCurrentApplicationFilter())(rItem); }; - std::vector<TemplateItemProperties> aItems = mxLocalView->getFilteredItems(aFunc); - mxLocalView->insertItems(aItems, mxCBFolder->get_active()!=0, true); - mxLocalView->Invalidate(); + std::vector<TemplateItemProperties> aItems = maLocalView.getFilteredItems(aFunc); + maLocalView.insertItems(aItems, mxCBFolder->get_active() != 0, true); + maLocalView.Invalidate(); } IMPL_LINK_NOARG(SfxTemplateManagerDlg, GetFocusHdl, weld::Widget&, void) { - mxLocalView->deselectItems(); + maLocalView.deselectItems(); maSelTemplates.clear(); } @@ -945,7 +945,7 @@ void SfxTemplateManagerDlg::OnTemplateImportCategory(std::u16string_view sCatego return; //Import to the selected regions - TemplateContainerItem* pContItem = mxLocalView->getRegion(sCategory); + TemplateContainerItem* pContItem = maLocalView.getRegion(sCategory); if(!pContItem) return; @@ -953,7 +953,7 @@ void SfxTemplateManagerDlg::OnTemplateImportCategory(std::u16string_view sCatego for (const auto& rFile : aFiles) { - if(!mxLocalView->copyFrom(pContItem, rFile)) + if (!maLocalView.copyFrom(pContItem, rFile)) { if (aTemplateList.isEmpty()) aTemplateList = rFile; @@ -1005,8 +1005,8 @@ void SfxTemplateManagerDlg::OnTemplateExport() OUString aPath = aPathObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); - if (!mxLocalView->exportTo(pItem->mnDocId + 1, //mnId w.r.t. region = mDocId + 1 - mxLocalView->getRegionId(pItem->mnRegionId), //pItem->mnRegionId does not store actual region Id + if (!maLocalView.exportTo(pItem->mnDocId + 1, // mnId w.r.t. region = mDocId + 1 + maLocalView.getRegionId(pItem->mnRegionId), // pItem->mnRegionId does not store actual region Id aPath)) { if (aTemplateList.isEmpty()) @@ -1015,7 +1015,7 @@ void SfxTemplateManagerDlg::OnTemplateExport() aTemplateList += " " + pItem->maTitle; } ++i; - mxLocalView->deselectItems(); + maLocalView.deselectItems(); } if (!aTemplateList.isEmpty()) @@ -1053,7 +1053,7 @@ void SfxTemplateManagerDlg::OnCategoryNew() OUString aName = dlg.GetEntryText(); - if(mxLocalView->createRegion(aName)) + if (maLocalView.createRegion(aName)) mxCBFolder->append_text(aName); else { @@ -1078,14 +1078,14 @@ void SfxTemplateManagerDlg::OnCategoryRename() OUString aName = dlg.GetEntryText(); - if(mxLocalView->renameRegion(sCategory, aName)) + if (maLocalView.renameRegion(sCategory, aName)) { sal_Int32 nPos = mxCBFolder->find_text(sCategory); mxCBFolder->remove(nPos); mxCBFolder->insert_text(nPos, aName); mxCBFolder->set_active(nPos); - mxLocalView->reload(); + maLocalView.reload(); SearchUpdate(); } else @@ -1107,9 +1107,9 @@ void SfxTemplateManagerDlg::OnCategoryDelete() if (popupDlg->run() != RET_YES) return; - sal_Int16 nItemId = mxLocalView->getRegionId(sCategory); + sal_Int16 nItemId = maLocalView.getRegionId(sCategory); - if (!mxLocalView->removeRegion(nItemId)) + if (!maLocalView.removeRegion(nItemId)) { OUString sMsg( SfxResId(STR_MSG_ERROR_DELETE_FOLDER) ); std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(m_xDialog.get(), @@ -1122,8 +1122,8 @@ void SfxTemplateManagerDlg::OnCategoryDelete() mxCBFolder->remove_text(sCategory); } - mxLocalView->reload(); - mxLocalView->showAllTemplates(); + maLocalView.reload(); + maLocalView.showAllTemplates(); mxCBApp->set_active(0); mxCBFolder->set_active(0); SearchUpdate(); @@ -1185,7 +1185,7 @@ void SfxTemplateManagerDlg::localMoveTo(sal_uInt16 nItemId) { // Move templates to desired folder if for some reason move fails // try copying them. - mxLocalView->moveTemplates(maSelTemplates,nItemId); + maLocalView.moveTemplates(maSelTemplates, nItemId); } } @@ -1311,10 +1311,10 @@ SfxTemplateSelectionDlg::SfxTemplateSelectionDlg(weld::Window* pParent) mxCBFolder->set_active(0); m_xDialog->set_title(SfxResId(STR_TEMPLATE_SELECTION)); - if (mxLocalView->IsVisible()) + if (maLocalView.IsVisible()) { - mxLocalView->filterItems(ViewFilter_Application(getCurrentApplicationFilter())); - mxLocalView->showAllTemplates(); + maLocalView.filterItems(ViewFilter_Application(getCurrentApplicationFilter())); + maLocalView.showAllTemplates(); } mxCBApp->set_sensitive(false); @@ -1322,7 +1322,7 @@ SfxTemplateSelectionDlg::SfxTemplateSelectionDlg(weld::Window* pParent) mxCBXHideDlg->show(); mxCBXHideDlg->set_active(true); - mxLocalView->setOpenTemplateHdl(LINK(this,SfxTemplateSelectionDlg, OpenTemplateHdl)); + maLocalView.setOpenTemplateHdl(LINK(this, SfxTemplateSelectionDlg, OpenTemplateHdl)); mxOKButton->connect_clicked(LINK(this, SfxTemplateSelectionDlg, OkClickHdl)); updateMenuItems(); }
