[Libreoffice-commits] core.git: include/sfx2 sfx2/inc sfx2/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Oct 22 19:40:48 UTC 2020
include/sfx2/templatedlg.hxx | 2
include/sfx2/templatelocalview.hxx | 6 -
sfx2/inc/templatedefaultview.hxx | 2
sfx2/source/control/recentdocsviewitem.cxx | 4 -
sfx2/source/control/templatedefaultview.cxx | 4 -
sfx2/source/control/templatelocalview.cxx | 92 ++++++++++++++--------------
sfx2/source/control/templatesearchview.cxx | 2
sfx2/source/doc/templatedlg.cxx | 2
8 files changed, 57 insertions(+), 57 deletions(-)
New commits:
commit 32f35ba5f01c580016e327a3fcceb88cb07164ed
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 21 20:53:02 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 22 21:40:03 2020 +0200
rename SfxTemplateLocalView back to TemplateLocalView
Change-Id: Ib5221799604886120f498313ffd37c0a80987bc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104646
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index 9d2f637ad51c..b9544652e540 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -134,7 +134,7 @@ protected:
std::unique_ptr<weld::CheckButton> mxCBXHideDlg;
std::unique_ptr<weld::MenuButton> mxActionBar;
std::unique_ptr<TemplateSearchView> mxSearchView;
- std::unique_ptr<SfxTemplateLocalView> mxLocalView;
+ std::unique_ptr<TemplateLocalView> mxLocalView;
std::unique_ptr<weld::Menu> mxTemplateDefaultMenu;
std::unique_ptr<weld::CustomWeld> mxSearchViewWeld;
std::unique_ptr<weld::CustomWeld> mxLocalViewWeld;
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index cd2efb89db8f..d77a7c781eb4 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -63,16 +63,16 @@ private:
FILTER_APPLICATION mApp;
};
-class SfxTemplateLocalView : public ThumbnailView
+class TemplateLocalView : public ThumbnailView
{
typedef bool (*selection_cmp_fn)(const ThumbnailViewItem*,const ThumbnailViewItem*);
public:
- SfxTemplateLocalView(std::unique_ptr<weld::ScrolledWindow> xWindow,
+ TemplateLocalView(std::unique_ptr<weld::ScrolledWindow> xWindow,
std::unique_ptr<weld::Menu> xMenu);
- virtual ~SfxTemplateLocalView () override;
+ virtual ~TemplateLocalView () override;
// Fill view with new item list
void insertItems (const std::vector<TemplateItemProperties> &rTemplates, bool isRegionSelected = true, bool bShowCategoryInTooltip = false);
diff --git a/sfx2/inc/templatedefaultview.hxx b/sfx2/inc/templatedefaultview.hxx
index c5cb975fe943..36059b02c651 100644
--- a/sfx2/inc/templatedefaultview.hxx
+++ b/sfx2/inc/templatedefaultview.hxx
@@ -11,7 +11,7 @@
#include <sfx2/templatelocalview.hxx>
-class TemplateDefaultView : public SfxTemplateLocalView
+class TemplateDefaultView : public TemplateLocalView
{
public:
TemplateDefaultView(std::unique_ptr<weld::ScrolledWindow> xWindow,
diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx
index 9b73ef2c88ef..8a047b20ee8d 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -84,7 +84,7 @@ RecentDocsViewItem::RecentDocsViewItem(sfx2::RecentDocsView &rView, const OUStri
if (aExtSize.Width() > aThumbnailSize.Width() || aExtSize.Height() > aThumbnailSize.Height())
{
- aExt = SfxTemplateLocalView::scaleImg(aExt, aThumbnailSize.Width(), aThumbnailSize.Height());
+ aExt = TemplateLocalView::scaleImg(aExt, aThumbnailSize.Width(), aThumbnailSize.Height());
aExtSize = aExt.GetSizePixel();
}
@@ -99,7 +99,7 @@ RecentDocsViewItem::RecentDocsViewItem(sfx2::RecentDocsView &rView, const OUStri
}
maTitle = aTitle;
- maPreview1 = SfxTemplateLocalView::scaleImg(aThumbnail, nThumbnailSize, nThumbnailSize);
+ maPreview1 = TemplateLocalView::scaleImg(aThumbnail, nThumbnailSize, nThumbnailSize);
}
::tools::Rectangle RecentDocsViewItem::updateHighlight(bool bVisible, const Point& rPoint)
diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx
index a4a769f59308..bb03000bae84 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -23,7 +23,7 @@ constexpr tools::Long gnTextHeight = 30;
TemplateDefaultView::TemplateDefaultView(std::unique_ptr<weld::ScrolledWindow> xWindow,
std::unique_ptr<weld::Menu> xMenu)
- : SfxTemplateLocalView(std::move(xWindow), std::move(xMenu))
+ : TemplateLocalView(std::move(xWindow), std::move(xMenu))
{
tools::Rectangle aScreen = Application::GetScreenPosSizePixel(Application::GetDisplayBuiltInScreen());
mnItemMaxSize = std::min(aScreen.GetWidth(),aScreen.GetHeight()) > 800 ? 256 : 192;
@@ -64,7 +64,7 @@ bool TemplateDefaultView::MouseButtonDown( const MouseEvent& rMEvt )
return true;
}
- return SfxTemplateLocalView::MouseButtonDown(rMEvt);
+ return TemplateLocalView::MouseButtonDown(rMEvt);
}
void TemplateDefaultView::createContextMenu()
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index ebeee7a76bc7..1acd11556f43 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -71,13 +71,13 @@ bool ViewFilter_Application::operator () (const ThumbnailViewItem *pItem)
return true;
}
-void SfxTemplateLocalView::updateThumbnailDimensions(long itemMaxSize)
+void TemplateLocalView::updateThumbnailDimensions(long itemMaxSize)
{
mnThumbnailWidth = itemMaxSize;
mnThumbnailHeight = itemMaxSize;
}
-SfxTemplateLocalView::SfxTemplateLocalView(std::unique_ptr<weld::ScrolledWindow> xWindow,
+TemplateLocalView::TemplateLocalView(std::unique_ptr<weld::ScrolledWindow> xWindow,
std::unique_ptr<weld::Menu> xMenu)
: ThumbnailView(std::move(xWindow), std::move(xMenu))
, mnCurRegionId(0)
@@ -89,11 +89,11 @@ SfxTemplateLocalView::SfxTemplateLocalView(std::unique_ptr<weld::ScrolledWindow>
{
}
-SfxTemplateLocalView::~SfxTemplateLocalView()
+TemplateLocalView::~TemplateLocalView()
{
}
-void SfxTemplateLocalView::Populate()
+void TemplateLocalView::Populate()
{
maRegions.clear();
maAllTemplates.clear();
@@ -121,7 +121,7 @@ void SfxTemplateLocalView::Populate()
aProperties.aName = aName;
aProperties.aPath = aURL;
aProperties.aRegionName = aRegionName;
- aProperties.aThumbnail = SfxTemplateLocalView::fetchThumbnail(aURL,
+ aProperties.aThumbnail = TemplateLocalView::fetchThumbnail(aURL,
mnThumbnailWidth,
mnThumbnailHeight);
@@ -133,7 +133,7 @@ void SfxTemplateLocalView::Populate()
}
}
-void SfxTemplateLocalView::reload()
+void TemplateLocalView::reload()
{
mpDocTemplates->Update();
@@ -160,7 +160,7 @@ void SfxTemplateLocalView::reload()
deselectItems();
}
-void SfxTemplateLocalView::showAllTemplates()
+void TemplateLocalView::showAllTemplates()
{
mnCurRegionId = 0;
@@ -169,7 +169,7 @@ void SfxTemplateLocalView::showAllTemplates()
maOpenRegionHdl.Call(nullptr);
}
-void SfxTemplateLocalView::showRegion(TemplateContainerItem const *pItem)
+void TemplateLocalView::showRegion(TemplateContainerItem const *pItem)
{
mnCurRegionId = pItem->mnRegionId+1;
@@ -178,7 +178,7 @@ void SfxTemplateLocalView::showRegion(TemplateContainerItem const *pItem)
maOpenRegionHdl.Call(nullptr);
}
-void SfxTemplateLocalView::showRegion(const OUString &rName)
+void TemplateLocalView::showRegion(const OUString &rName)
{
for (auto const & pRegion : maRegions)
{
@@ -190,7 +190,7 @@ void SfxTemplateLocalView::showRegion(const OUString &rName)
}
}
-TemplateContainerItem* SfxTemplateLocalView::getRegion(OUString const & rName)
+TemplateContainerItem* TemplateLocalView::getRegion(OUString const & rName)
{
for (auto const & pRegion : maRegions)
if (pRegion->maTitle == rName)
@@ -199,7 +199,7 @@ TemplateContainerItem* SfxTemplateLocalView::getRegion(OUString const & rName)
return nullptr;
}
-void SfxTemplateLocalView::createContextMenu(const bool bIsDefault)
+void TemplateLocalView::createContextMenu(const bool bIsDefault)
{
mxContextMenu->clear();
mxContextMenu->append("open",SfxResId(STR_OPEN));
@@ -220,7 +220,7 @@ void SfxTemplateLocalView::createContextMenu(const bool bIsDefault)
Invalidate();
}
-void SfxTemplateLocalView::ContextMenuSelectHdl(const OString& rIdent)
+void TemplateLocalView::ContextMenuSelectHdl(const OString& rIdent)
{
if (rIdent == "open")
maOpenTemplateHdl.Call(maSelectedItem);
@@ -256,14 +256,14 @@ void SfxTemplateLocalView::ContextMenuSelectHdl(const OString& rIdent)
maDefaultTemplateHdl.Call(maSelectedItem);
}
-sal_uInt16 SfxTemplateLocalView::getRegionId(size_t pos) const
+sal_uInt16 TemplateLocalView::getRegionId(size_t pos) const
{
assert(pos < maRegions.size());
return maRegions[pos]->mnId;
}
-sal_uInt16 SfxTemplateLocalView::getRegionId(OUString const & sRegion) const
+sal_uInt16 TemplateLocalView::getRegionId(OUString const & sRegion) const
{
for (auto const & pRegion : maRegions)
{
@@ -274,12 +274,12 @@ sal_uInt16 SfxTemplateLocalView::getRegionId(OUString const & sRegion) const
return 0;
}
-OUString SfxTemplateLocalView::getRegionName(const sal_uInt16 nRegionId) const
+OUString TemplateLocalView::getRegionName(const sal_uInt16 nRegionId) const
{
return mpDocTemplates->GetRegionName(nRegionId);
}
-OUString SfxTemplateLocalView::getRegionItemName(const sal_uInt16 nItemId) const
+OUString TemplateLocalView::getRegionItemName(const sal_uInt16 nItemId) const
{
for (auto const & pRegion : maRegions)
{
@@ -290,7 +290,7 @@ OUString SfxTemplateLocalView::getRegionItemName(const sal_uInt16 nItemId) const
return OUString();
}
-std::vector<OUString> SfxTemplateLocalView::getFolderNames()
+std::vector<OUString> TemplateLocalView::getFolderNames()
{
size_t n = maRegions.size();
std::vector<OUString> ret(n);
@@ -302,7 +302,7 @@ std::vector<OUString> SfxTemplateLocalView::getFolderNames()
}
std::vector<TemplateItemProperties>
-SfxTemplateLocalView::getFilteredItems(const std::function<bool (const TemplateItemProperties&)> &rFunc) const
+TemplateLocalView::getFilteredItems(const std::function<bool (const TemplateItemProperties&)> &rFunc) const
{
std::vector<TemplateItemProperties> aItems;
@@ -331,7 +331,7 @@ SfxTemplateLocalView::getFilteredItems(const std::function<bool (const TemplateI
return aItems;
}
-sal_uInt16 SfxTemplateLocalView::createRegion(const OUString &rName)
+sal_uInt16 TemplateLocalView::createRegion(const OUString &rName)
{
sal_uInt16 nRegionId = mpDocTemplates->GetRegionCount(); // Next regionId
sal_uInt16 nItemId = getNextItemId();
@@ -349,7 +349,7 @@ sal_uInt16 SfxTemplateLocalView::createRegion(const OUString &rName)
return nItemId;
}
-bool SfxTemplateLocalView::renameRegion(const OUString &rTitle, const OUString &rNewTitle)
+bool TemplateLocalView::renameRegion(const OUString &rTitle, const OUString &rNewTitle)
{
TemplateContainerItem *pRegion = getRegion(rTitle);
@@ -361,7 +361,7 @@ bool SfxTemplateLocalView::renameRegion(const OUString &rTitle, const OUString &
return false;
}
-bool SfxTemplateLocalView::removeRegion(const sal_uInt16 nItemId)
+bool TemplateLocalView::removeRegion(const sal_uInt16 nItemId)
{
sal_uInt16 nRegionId = USHRT_MAX;
@@ -400,7 +400,7 @@ bool SfxTemplateLocalView::removeRegion(const sal_uInt16 nItemId)
return true;
}
-bool SfxTemplateLocalView::removeTemplate (const sal_uInt16 nItemId, const sal_uInt16 nSrcItemId)
+bool TemplateLocalView::removeTemplate (const sal_uInt16 nItemId, const sal_uInt16 nSrcItemId)
{
for (auto const & pRegion : maRegions)
{
@@ -435,7 +435,7 @@ bool SfxTemplateLocalView::removeTemplate (const sal_uInt16 nItemId, const sal_u
return true;
}
-bool SfxTemplateLocalView::moveTemplate (const ThumbnailViewItem *pItem, const sal_uInt16 nSrcItem,
+bool TemplateLocalView::moveTemplate (const ThumbnailViewItem *pItem, const sal_uInt16 nSrcItem,
const sal_uInt16 nTargetItem)
{
TemplateContainerItem *pTarget = nullptr;
@@ -523,7 +523,7 @@ bool SfxTemplateLocalView::moveTemplate (const ThumbnailViewItem *pItem, const s
return false;
}
-void SfxTemplateLocalView::moveTemplates(const std::set<const ThumbnailViewItem*, selection_cmp_fn> &rItems,
+void TemplateLocalView::moveTemplates(const std::set<const ThumbnailViewItem*, selection_cmp_fn> &rItems,
const sal_uInt16 nTargetItem)
{
TemplateContainerItem *pTarget = nullptr;
@@ -641,7 +641,7 @@ void SfxTemplateLocalView::moveTemplates(const std::set<const ThumbnailViewItem*
}
}
-bool SfxTemplateLocalView::copyFrom (TemplateContainerItem *pItem, const OUString &rPath)
+bool TemplateLocalView::copyFrom (TemplateContainerItem *pItem, const OUString &rPath)
{
sal_uInt16 nId = 1;
sal_uInt16 nDocId = 0;
@@ -661,7 +661,7 @@ bool SfxTemplateLocalView::copyFrom (TemplateContainerItem *pItem, const OUStrin
aTemplate.nDocId = nDocId;
aTemplate.nRegionId = nRegionId;
aTemplate.aName = aPath;
- aTemplate.aThumbnail = SfxTemplateLocalView::fetchThumbnail(rPath,
+ aTemplate.aThumbnail = TemplateLocalView::fetchThumbnail(rPath,
TEMPLATE_THUMBNAIL_MAX_WIDTH,
TEMPLATE_THUMBNAIL_MAX_HEIGHT);
aTemplate.aPath = rPath;
@@ -677,7 +677,7 @@ bool SfxTemplateLocalView::copyFrom (TemplateContainerItem *pItem, const OUStrin
return false;
}
-bool SfxTemplateLocalView::exportTo(const sal_uInt16 nItemId, const sal_uInt16 nRegionItemId, const OUString &rName)
+bool TemplateLocalView::exportTo(const sal_uInt16 nItemId, const sal_uInt16 nRegionItemId, const OUString &rName)
{
for (auto const & pRegItem : maRegions)
{
@@ -698,7 +698,7 @@ bool SfxTemplateLocalView::exportTo(const sal_uInt16 nItemId, const sal_uInt16 n
return false;
}
-bool SfxTemplateLocalView::renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle)
+bool TemplateLocalView::renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle)
{
sal_uInt16 nRegionId = 0;
sal_uInt16 nDocId = USHRT_MAX;
@@ -713,7 +713,7 @@ bool SfxTemplateLocalView::renameItem(ThumbnailViewItem* pItem, const OUString&
return mpDocTemplates->SetName( sNewTitle, nRegionId, nDocId );
}
-void SfxTemplateLocalView::insertItems(const std::vector<TemplateItemProperties> &rTemplates, bool isRegionSelected, bool bShowCategoryInTooltip)
+void TemplateLocalView::insertItems(const std::vector<TemplateItemProperties> &rTemplates, bool isRegionSelected, bool bShowCategoryInTooltip)
{
std::vector<std::unique_ptr<ThumbnailViewItem>> aItems(rTemplates.size());
for (size_t i = 0, n = rTemplates.size(); i < n; ++i )
@@ -748,7 +748,7 @@ void SfxTemplateLocalView::insertItems(const std::vector<TemplateItemProperties>
if ( pCur->aThumbnail.IsEmpty() )
{
// Use the default thumbnail if we have nothing else
- pChild->maPreview1 = SfxTemplateLocalView::getDefaultThumbnail(pCur->aPath);
+ pChild->maPreview1 = TemplateLocalView::getDefaultThumbnail(pCur->aPath);
}
aItems[i] = std::move(pChild);
@@ -757,13 +757,13 @@ void SfxTemplateLocalView::insertItems(const std::vector<TemplateItemProperties>
updateItems(std::move(aItems));
}
-bool SfxTemplateLocalView::MouseButtonDown( const MouseEvent& rMEvt )
+bool TemplateLocalView::MouseButtonDown( const MouseEvent& rMEvt )
{
GrabFocus();
return ThumbnailView::MouseButtonDown(rMEvt);
}
-bool SfxTemplateLocalView::Command(const CommandEvent& rCEvt)
+bool TemplateLocalView::Command(const CommandEvent& rCEvt)
{
if (rCEvt.GetCommand() != CommandEventId::ContextMenu)
return CustomWidgetController::Command(rCEvt);
@@ -804,7 +804,7 @@ bool SfxTemplateLocalView::Command(const CommandEvent& rCEvt)
return true;
}
-bool SfxTemplateLocalView::KeyInput( const KeyEvent& rKEvt )
+bool TemplateLocalView::KeyInput( const KeyEvent& rKEvt )
{
vcl::KeyCode aKeyCode = rKEvt.GetKeyCode();
@@ -846,37 +846,37 @@ bool SfxTemplateLocalView::KeyInput( const KeyEvent& rKEvt )
return ThumbnailView::KeyInput(rKEvt);
}
-void SfxTemplateLocalView::setOpenRegionHdl(const Link<void*,void> &rLink)
+void TemplateLocalView::setOpenRegionHdl(const Link<void*,void> &rLink)
{
maOpenRegionHdl = rLink;
}
-void SfxTemplateLocalView::setCreateContextMenuHdl(const Link<ThumbnailViewItem*,void> &rLink)
+void TemplateLocalView::setCreateContextMenuHdl(const Link<ThumbnailViewItem*,void> &rLink)
{
maCreateContextMenuHdl = rLink;
}
-void SfxTemplateLocalView::setOpenTemplateHdl(const Link<ThumbnailViewItem*,void> &rLink)
+void TemplateLocalView::setOpenTemplateHdl(const Link<ThumbnailViewItem*,void> &rLink)
{
maOpenTemplateHdl = rLink;
}
-void SfxTemplateLocalView::setEditTemplateHdl(const Link<ThumbnailViewItem*,void> &rLink)
+void TemplateLocalView::setEditTemplateHdl(const Link<ThumbnailViewItem*,void> &rLink)
{
maEditTemplateHdl = rLink;
}
-void SfxTemplateLocalView::setDeleteTemplateHdl(const Link<ThumbnailViewItem*,void> &rLink)
+void TemplateLocalView::setDeleteTemplateHdl(const Link<ThumbnailViewItem*,void> &rLink)
{
maDeleteTemplateHdl = rLink;
}
-void SfxTemplateLocalView::setDefaultTemplateHdl(const Link<ThumbnailViewItem*,void> &rLink)
+void TemplateLocalView::setDefaultTemplateHdl(const Link<ThumbnailViewItem*,void> &rLink)
{
maDefaultTemplateHdl = rLink;
}
-BitmapEx SfxTemplateLocalView::scaleImg (const BitmapEx &rImg, tools::Long width, tools::Long height)
+BitmapEx TemplateLocalView::scaleImg (const BitmapEx &rImg, tools::Long width, tools::Long height)
{
BitmapEx aImg = rImg;
@@ -899,7 +899,7 @@ BitmapEx SfxTemplateLocalView::scaleImg (const BitmapEx &rImg, tools::Long width
return aImg;
}
-bool SfxTemplateLocalView::IsDefaultTemplate(const OUString& rPath)
+bool TemplateLocalView::IsDefaultTemplate(const OUString& rPath)
{
SvtModuleOptions aModOpt;
const css::uno::Sequence<OUString> &aServiceNames = aModOpt.GetAllServiceNames();
@@ -908,7 +908,7 @@ bool SfxTemplateLocalView::IsDefaultTemplate(const OUString& rPath)
return SfxObjectFactory::GetStandardTemplate(rName).match(rPath); });
}
-void SfxTemplateLocalView::RemoveDefaultTemplateIcon(const OUString& rPath)
+void TemplateLocalView::RemoveDefaultTemplateIcon(const OUString& rPath)
{
for (const std::unique_ptr<ThumbnailViewItem>& pItem : mItemList)
{
@@ -922,7 +922,7 @@ void SfxTemplateLocalView::RemoveDefaultTemplateIcon(const OUString& rPath)
}
}
-BitmapEx SfxTemplateLocalView::getDefaultThumbnail( const OUString& rPath )
+BitmapEx TemplateLocalView::getDefaultThumbnail( const OUString& rPath )
{
BitmapEx aImg;
INetURLObject aUrl(rPath);
@@ -940,12 +940,12 @@ BitmapEx SfxTemplateLocalView::getDefaultThumbnail( const OUString& rPath )
return aImg;
}
-BitmapEx SfxTemplateLocalView::fetchThumbnail (const OUString &msURL, tools::Long width, tools::Long height)
+BitmapEx TemplateLocalView::fetchThumbnail (const OUString &msURL, tools::Long width, tools::Long height)
{
- return SfxTemplateLocalView::scaleImg(ThumbnailView::readThumbnail(msURL), width, height);
+ return TemplateLocalView::scaleImg(ThumbnailView::readThumbnail(msURL), width, height);
}
-void SfxTemplateLocalView::OnItemDblClicked (ThumbnailViewItem *pItem)
+void TemplateLocalView::OnItemDblClicked (ThumbnailViewItem *pItem)
{
TemplateViewItem* pViewItem = dynamic_cast<TemplateViewItem*>(pItem);
diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx
index c0718230db7e..25e62fd27384 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -214,7 +214,7 @@ void TemplateSearchView::AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 nRegionI
pItem->setHelpText(rSubtitle);
pItem->setPath(rPath);
- if (SfxTemplateLocalView::IsDefaultTemplate(rPath))
+ if (TemplateLocalView::IsDefaultTemplate(rPath))
pItem->showDefaultIcon(true);
ThumbnailView::AppendItem(std::move(pItem));
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 14328af69ee3..aaed4e7f7cbe 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -168,7 +168,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(weld::Window *pParent)
, mxActionBar(m_xBuilder->weld_menu_button("action_menu"))
, mxSearchView(new TemplateSearchView(m_xBuilder->weld_scrolled_window("scrollsearch", true),
m_xBuilder->weld_menu("contextmenu1")))
- , mxLocalView(new SfxTemplateLocalView(m_xBuilder->weld_scrolled_window("scrolllocal", true),
+ , mxLocalView(new TemplateLocalView(m_xBuilder->weld_scrolled_window("scrolllocal", true),
m_xBuilder->weld_menu("contextmenu2")))
, mxTemplateDefaultMenu(m_xBuilder->weld_menu("submenu"))
, mxSearchViewWeld(new weld::CustomWeld(*m_xBuilder, "search_view", *mxSearchView))
More information about the Libreoffice-commits
mailing list