diff options
author | Rafael Dominguez <venccsralph@gmail.com> | 2012-07-29 22:52:44 -0430 |
---|---|---|
committer | Rafael Dominguez <venccsralph@gmail.com> | 2012-07-29 23:34:33 -0430 |
commit | 8c71dff488bd91e8f20018af38ed906762ea58e8 (patch) | |
tree | df85854cfb18f470e7d57a9326e8e0ea4774a03a /sfx2 | |
parent | da501ad185ee35ac85724866035b813fe08d8717 (diff) |
Rename TemplateFolderView to TemplateLocalView.
Change-Id: I1cc75b9f4279323ca26943f8a2f3d2d0ac1a7edc
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/Library_sfx.mk | 4 | ||||
-rw-r--r-- | sfx2/Package_inc.mk | 4 | ||||
-rw-r--r-- | sfx2/inc/sfx2/templatelocalview.hxx (renamed from sfx2/inc/sfx2/templatefolderview.hxx) | 10 | ||||
-rw-r--r-- | sfx2/inc/sfx2/templatelocalviewitem.hxx (renamed from sfx2/inc/sfx2/templatefolderviewitem.hxx) | 6 | ||||
-rw-r--r-- | sfx2/inc/templatedlg.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/control/templatelocalview.cxx (renamed from sfx2/source/control/templatefolderview.cxx) | 74 | ||||
-rw-r--r-- | sfx2/source/control/templatelocalviewitem.cxx (renamed from sfx2/source/control/templatefolderviewitem.cxx) | 10 | ||||
-rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 8 |
8 files changed, 60 insertions, 60 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 06f64d072861..95c68e2c07f3 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -136,8 +136,8 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/control/templateabstractview \ sfx2/source/control/templateview \ sfx2/source/control/templateviewitem \ - sfx2/source/control/templatefolderview \ - sfx2/source/control/templatefolderviewitem \ + sfx2/source/control/templatelocalview \ + sfx2/source/control/templatelocalviewitem \ sfx2/source/control/templateonlineview \ sfx2/source/control/templateonlineviewitem \ sfx2/source/control/templatesearchview \ diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk index c3bfff6b5e58..1a71255c98b8 100644 --- a/sfx2/Package_inc.mk +++ b/sfx2/Package_inc.mk @@ -120,8 +120,8 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.h $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templatelocnames.hrc,sfx2/templatelocnames.hrc)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templateabstractview.hxx,sfx2/templateabstractview.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templateview.hxx,sfx2/templateview.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templatefolderview.hxx,sfx2/templatefolderview.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templatefolderviewitem.hxx,sfx2/templatefolderviewitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templatelocalview.hxx,sfx2/templatelocalview.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templatelocalviewitem.hxx,sfx2/templatelocalviewitem.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templateonlineview.hxx,sfx2/templateonlineview.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templateonlineviewitem.hxx,sfx2/templateonlineviewitem.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/thumbnailview.hxx,sfx2/thumbnailview.hxx)) diff --git a/sfx2/inc/sfx2/templatefolderview.hxx b/sfx2/inc/sfx2/templatelocalview.hxx index 44c61e084231..f3161e7d3616 100644 --- a/sfx2/inc/sfx2/templatefolderview.hxx +++ b/sfx2/inc/sfx2/templatelocalview.hxx @@ -16,7 +16,7 @@ #include <sfx2/templateproperties.hxx> class SfxDocumentTemplates; -class TemplateFolderViewItem; +class TemplateLocalViewItem; enum FILTER_APPLICATION { @@ -27,13 +27,13 @@ enum FILTER_APPLICATION FILTER_APP_DRAW }; -class SFX2_DLLPUBLIC TemplateFolderView : public TemplateAbstractView +class SFX2_DLLPUBLIC TemplateLocalView : public TemplateAbstractView { public: - TemplateFolderView ( Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false ); + TemplateLocalView ( Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false ); - virtual ~TemplateFolderView (); + virtual ~TemplateLocalView (); // Fill view with template folders thumbnails virtual void Populate (); @@ -60,7 +60,7 @@ public: void copyFrom (const sal_uInt16 nRegionItemId, const BitmapEx &rThumbnail, const OUString &rPath); - void copyFrom (TemplateFolderViewItem *pItem, const rtl::OUString &rPath); + void copyFrom (TemplateLocalViewItem *pItem, const rtl::OUString &rPath); private: diff --git a/sfx2/inc/sfx2/templatefolderviewitem.hxx b/sfx2/inc/sfx2/templatelocalviewitem.hxx index d4c6c0ac8e88..2f751591918b 100644 --- a/sfx2/inc/sfx2/templatefolderviewitem.hxx +++ b/sfx2/inc/sfx2/templatelocalviewitem.hxx @@ -15,16 +15,16 @@ class TemplateViewItem; -class TemplateFolderViewItem : public ThumbnailViewItem +class TemplateLocalViewItem : public ThumbnailViewItem { public: BitmapEx maPreview2; std::vector<TemplateItemProperties> maTemplates; - TemplateFolderViewItem (ThumbnailView &rView, Window *pParent); + TemplateLocalViewItem (ThumbnailView &rView, Window *pParent); - virtual ~TemplateFolderViewItem (); + virtual ~TemplateLocalViewItem (); virtual void calculateItemsPosition (sal_uInt32 nMaxTextLenght); diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx index bffc83b09ece..406fcb513ca1 100644 --- a/sfx2/inc/templatedlg.hxx +++ b/sfx2/inc/templatedlg.hxx @@ -18,7 +18,7 @@ class Edit; class PopupMenu; class TemplateAbstractView; -class TemplateFolderView; +class TemplateLocalView; class TemplateOnlineView; class TemplateSearchView; class ThumbnailView; @@ -115,7 +115,7 @@ private: ToolBox *mpTemplateBar; TemplateSearchView *mpSearchView; TemplateAbstractView *mpCurView; - TemplateFolderView *maView; + TemplateLocalView *maView; TemplateOnlineView *mpOnlineView; PopupMenu *mpCreateMenu; PopupMenu *mpActionMenu; diff --git a/sfx2/source/control/templatefolderview.cxx b/sfx2/source/control/templatelocalview.cxx index 30cd5fff0ab3..fa19d5463a44 100644 --- a/sfx2/source/control/templatefolderview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <sfx2/templatefolderview.hxx> +#include <sfx2/templatelocalview.hxx> #include <comphelper/processfactory.hxx> #include <sfx2/doctempl.hxx> @@ -36,7 +36,7 @@ #define INIT_VIEW_COLS 3 #define INIT_VIEW_LINES 1 -void lcl_updateThumbnails (TemplateFolderViewItem *pItem); +void lcl_updateThumbnails (TemplateLocalViewItem *pItem); // Display template items depending on the generator application class ViewFilter_Application @@ -92,7 +92,7 @@ public: bool operator () (const ThumbnailViewItem *pItem) { - TemplateFolderViewItem *pFolderItem = (TemplateFolderViewItem*)pItem; + TemplateLocalViewItem *pFolderItem = (TemplateLocalViewItem*)pItem; std::vector<TemplateItemProperties> &rTemplates = pFolderItem->maTemplates; @@ -148,7 +148,7 @@ private: FILTER_APPLICATION meApp; }; -TemplateFolderView::TemplateFolderView ( Window* pParent, const ResId& rResId, bool bDisableTransientChildren) +TemplateLocalView::TemplateLocalView ( Window* pParent, const ResId& rResId, bool bDisableTransientChildren) : TemplateAbstractView(pParent,rResId,bDisableTransientChildren), mbFilteredResults(false), meFilterOption(FILTER_APP_NONE), @@ -163,15 +163,15 @@ TemplateFolderView::TemplateFolderView ( Window* pParent, const ResId& rResId, b ITEM_MAX_HEIGHT-THUMBNAIL_MAX_HEIGHT, ITEM_PADDING); - mpItemView->setChangeNameHdl(LINK(this,TemplateFolderView,ChangeNameHdl)); + mpItemView->setChangeNameHdl(LINK(this,TemplateLocalView,ChangeNameHdl)); } -TemplateFolderView::~TemplateFolderView() +TemplateLocalView::~TemplateLocalView() { delete mpDocTemplates; } -void TemplateFolderView::Populate () +void TemplateLocalView::Populate () { sal_uInt16 nCount = mpDocTemplates->GetRegionCount(); for (sal_uInt16 i = 0; i < nCount; ++i) @@ -184,7 +184,7 @@ void TemplateFolderView::Populate () aRegionName += "..."; } - TemplateFolderViewItem* pItem = new TemplateFolderViewItem( *this, this ); + TemplateLocalViewItem* pItem = new TemplateLocalViewItem( *this, this ); pItem->mnId = i+1; pItem->maTitle = aRegionName; pItem->setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected)); @@ -225,7 +225,7 @@ void TemplateFolderView::Populate () Invalidate(); } -std::vector<rtl::OUString> TemplateFolderView::getFolderNames() +std::vector<rtl::OUString> TemplateLocalView::getFolderNames() { size_t n = mItemList.size(); std::vector<rtl::OUString> ret(n); @@ -236,7 +236,7 @@ std::vector<rtl::OUString> TemplateFolderView::getFolderNames() return ret; } -void TemplateFolderView::showOverlay (bool bVisible) +void TemplateLocalView::showOverlay (bool bVisible) { mbActive = !bVisible; mpItemView->Show(bVisible); @@ -259,7 +259,7 @@ void TemplateFolderView::showOverlay (bool bVisible) } } -void TemplateFolderView::filterTemplatesByApp (const FILTER_APPLICATION &eApp) +void TemplateLocalView::filterTemplatesByApp (const FILTER_APPLICATION &eApp) { meFilterOption = eApp; @@ -275,13 +275,13 @@ void TemplateFolderView::filterTemplatesByApp (const FILTER_APPLICATION &eApp) } std::vector<TemplateItemProperties> -TemplateFolderView::getFilteredItems(const boost::function<bool (const TemplateItemProperties&) > &rFunc) const +TemplateLocalView::getFilteredItems(const boost::function<bool (const TemplateItemProperties&) > &rFunc) const { std::vector<TemplateItemProperties> aItems; for (size_t i = 0; i < mItemList.size(); ++i) { - TemplateFolderViewItem *pFolderItem = static_cast<TemplateFolderViewItem*>(mItemList[i]); + TemplateLocalViewItem *pFolderItem = static_cast<TemplateLocalViewItem*>(mItemList[i]); for (size_t j = 0; j < pFolderItem->maTemplates.size(); ++j) { @@ -293,7 +293,7 @@ TemplateFolderView::getFilteredItems(const boost::function<bool (const TemplateI return aItems; } -sal_uInt16 TemplateFolderView::createRegion(const rtl::OUString &rName) +sal_uInt16 TemplateLocalView::createRegion(const rtl::OUString &rName) { sal_uInt16 nRegionId = mpDocTemplates->GetRegionCount(); // Next regionId @@ -308,7 +308,7 @@ sal_uInt16 TemplateFolderView::createRegion(const rtl::OUString &rName) aRegionName += "..."; } - TemplateFolderViewItem* pItem = new TemplateFolderViewItem( *this, this ); + TemplateLocalViewItem* pItem = new TemplateLocalViewItem( *this, this ); pItem->mnId = nRegionId+1; pItem->maTitle = aRegionName; pItem->setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected)); @@ -323,7 +323,7 @@ sal_uInt16 TemplateFolderView::createRegion(const rtl::OUString &rName) return pItem->mnId; } -bool TemplateFolderView::removeRegion(const sal_uInt16 nItemId) +bool TemplateLocalView::removeRegion(const sal_uInt16 nItemId) { sal_uInt16 nRegionId = nItemId - 1; @@ -335,7 +335,7 @@ bool TemplateFolderView::removeRegion(const sal_uInt16 nItemId) return true; } -bool TemplateFolderView::removeTemplate (const sal_uInt16 nItemId, const sal_uInt16 nSrcItemId) +bool TemplateLocalView::removeTemplate (const sal_uInt16 nItemId, const sal_uInt16 nSrcItemId) { sal_uInt16 nRegionId = nSrcItemId - 1; sal_uInt16 nTemplateId = nItemId - 1; @@ -348,7 +348,7 @@ bool TemplateFolderView::removeTemplate (const sal_uInt16 nItemId, const sal_uIn if (mItemList[i]->mnId == nSrcItemId) { - TemplateFolderViewItem *pItem = static_cast<TemplateFolderViewItem*>(mItemList[i]); + TemplateLocalViewItem *pItem = static_cast<TemplateLocalViewItem*>(mItemList[i]); std::vector<TemplateItemProperties>::iterator pIter; for (pIter = pItem->maTemplates.begin(); pIter != pItem->maTemplates.end(); ++pIter) { @@ -373,21 +373,21 @@ bool TemplateFolderView::removeTemplate (const sal_uInt16 nItemId, const sal_uIn return true; } -bool TemplateFolderView::moveTemplate (const ThumbnailViewItem *pItem, const sal_uInt16 nSrcItem, +bool TemplateLocalView::moveTemplate (const ThumbnailViewItem *pItem, const sal_uInt16 nSrcItem, const sal_uInt16 nTargetItem, bool bCopy) { bool bRet = true; bool bRefresh = false; - TemplateFolderViewItem *pTarget = NULL; - TemplateFolderViewItem *pSrc = NULL; + TemplateLocalViewItem *pTarget = NULL; + TemplateLocalViewItem *pSrc = NULL; for (size_t i = 0, n = mItemList.size(); i < n; ++i) { if (mItemList[i]->mnId == nTargetItem) - pTarget = static_cast<TemplateFolderViewItem*>(mItemList[i]); + pTarget = static_cast<TemplateLocalViewItem*>(mItemList[i]); else if (mItemList[i]->mnId == nSrcItem) - pSrc = static_cast<TemplateFolderViewItem*>(mItemList[i]); + pSrc = static_cast<TemplateLocalViewItem*>(mItemList[i]); } if (pTarget && pSrc) @@ -459,7 +459,7 @@ bool TemplateFolderView::moveTemplate (const ThumbnailViewItem *pItem, const sal return bRet; } -bool TemplateFolderView::moveTemplates(std::set<const ThumbnailViewItem *> &rItems, +bool TemplateLocalView::moveTemplates(std::set<const ThumbnailViewItem *> &rItems, const sal_uInt16 nTargetItem, bool bCopy) { bool ret = true; @@ -468,15 +468,15 @@ bool TemplateFolderView::moveTemplates(std::set<const ThumbnailViewItem *> &rIte sal_uInt16 nSrcRegionId = mpItemView->getId(); sal_uInt16 nSrcRegionItemId = nSrcRegionId + 1; - TemplateFolderViewItem *pTarget = NULL; - TemplateFolderViewItem *pSrc = NULL; + TemplateLocalViewItem *pTarget = NULL; + TemplateLocalViewItem *pSrc = NULL; for (size_t i = 0, n = mItemList.size(); i < n; ++i) { if (mItemList[i]->mnId == nTargetItem) - pTarget = static_cast<TemplateFolderViewItem*>(mItemList[i]); + pTarget = static_cast<TemplateLocalViewItem*>(mItemList[i]); else if (mItemList[i]->mnId == nSrcRegionItemId) - pSrc = static_cast<TemplateFolderViewItem*>(mItemList[i]); + pSrc = static_cast<TemplateLocalViewItem*>(mItemList[i]); } if (pTarget && pSrc) @@ -551,7 +551,7 @@ bool TemplateFolderView::moveTemplates(std::set<const ThumbnailViewItem *> &rIte return ret; } -void TemplateFolderView::copyFrom(const sal_uInt16 nRegionItemId, const BitmapEx &rThumbnail, +void TemplateLocalView::copyFrom(const sal_uInt16 nRegionItemId, const BitmapEx &rThumbnail, const OUString &rPath) { sal_uInt16 nId = 0; @@ -576,8 +576,8 @@ void TemplateFolderView::copyFrom(const sal_uInt16 nRegionItemId, const BitmapEx { if (mItemList[i]->mnId == nRegionItemId) { - TemplateFolderViewItem *pItem = - static_cast<TemplateFolderViewItem*>(mItemList[i]); + TemplateLocalViewItem *pItem = + static_cast<TemplateLocalViewItem*>(mItemList[i]); pItem->maTemplates.push_back(aTemplate); @@ -589,7 +589,7 @@ void TemplateFolderView::copyFrom(const sal_uInt16 nRegionItemId, const BitmapEx } } -void TemplateFolderView::copyFrom (TemplateFolderViewItem *pItem, const rtl::OUString &rPath) +void TemplateLocalView::copyFrom (TemplateLocalViewItem *pItem, const rtl::OUString &rPath) { sal_uInt16 nId = 0; sal_uInt16 nRegionId = pItem->mnId - 1; @@ -618,7 +618,7 @@ void TemplateFolderView::copyFrom (TemplateFolderViewItem *pItem, const rtl::OUS } } -void TemplateFolderView::Resize() +void TemplateLocalView::Resize() { Size aWinSize = GetOutputSize(); Size aViewSize = mpItemView->GetSizePixel(); @@ -629,14 +629,14 @@ void TemplateFolderView::Resize() mpItemView->SetPosPixel(aPos); } -void TemplateFolderView::OnItemDblClicked (ThumbnailViewItem *pRegionItem) +void TemplateLocalView::OnItemDblClicked (ThumbnailViewItem *pRegionItem) { // Fill templates sal_uInt16 nRegionId = pRegionItem->mnId-1; mpItemView->setId(nRegionId); mpItemView->setName(mpDocTemplates->GetRegionName(nRegionId)); - mpItemView->InsertItems(static_cast<TemplateFolderViewItem*>(pRegionItem)->maTemplates); + mpItemView->InsertItems(static_cast<TemplateLocalViewItem*>(pRegionItem)->maTemplates); if (mbSelectionMode) mpItemView->setSelectionMode(true); @@ -648,7 +648,7 @@ void TemplateFolderView::OnItemDblClicked (ThumbnailViewItem *pRegionItem) mpItemView->Show(); } -IMPL_LINK(TemplateFolderView, ChangeNameHdl, TemplateView*, pView) +IMPL_LINK(TemplateLocalView, ChangeNameHdl, TemplateView*, pView) { sal_uInt16 nRegionId = pView->getId(); sal_uInt16 nItemId = nRegionId + 1; @@ -670,7 +670,7 @@ IMPL_LINK(TemplateFolderView, ChangeNameHdl, TemplateView*, pView) return true; } -void lcl_updateThumbnails (TemplateFolderViewItem *pItem) +void lcl_updateThumbnails (TemplateLocalViewItem *pItem) { // Update folder thumbnails for (size_t i = 0, n = pItem->maTemplates.size(); i < 2 && i < n; ++i) diff --git a/sfx2/source/control/templatefolderviewitem.cxx b/sfx2/source/control/templatelocalviewitem.cxx index d996c9801753..32f1e2e4dd30 100644 --- a/sfx2/source/control/templatefolderviewitem.cxx +++ b/sfx2/source/control/templatelocalviewitem.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <sfx2/templatefolderviewitem.hxx> +#include <sfx2/templatelocalviewitem.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -25,21 +25,21 @@ using namespace basegfx::tools; using namespace drawinglayer::attribute; using namespace drawinglayer::primitive2d; -TemplateFolderViewItem::TemplateFolderViewItem (ThumbnailView &rView, Window *pParent) +TemplateLocalViewItem::TemplateLocalViewItem (ThumbnailView &rView, Window *pParent) : ThumbnailViewItem(rView,pParent) { } -TemplateFolderViewItem::~TemplateFolderViewItem () +TemplateLocalViewItem::~TemplateLocalViewItem () { } -void TemplateFolderViewItem::calculateItemsPosition (sal_uInt32 nMaxTextLenght) +void TemplateLocalViewItem::calculateItemsPosition (sal_uInt32 nMaxTextLenght) { ThumbnailViewItem::calculateItemsPosition(nMaxTextLenght); } -void TemplateFolderViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, +void TemplateLocalViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, const ThumbnailItemAttributes *pAttrs) { int nCount = 0; diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 9d0cd285183a..f37130e77aea 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -16,8 +16,8 @@ #include <comphelper/processfactory.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/sfxresid.hxx> -#include <sfx2/templatefolderview.hxx> -#include <sfx2/templatefolderviewitem.hxx> +#include <sfx2/templatelocalview.hxx> +#include <sfx2/templatelocalviewitem.hxx> #include <sfx2/templateonlineview.hxx> #include <sfx2/templateviewitem.hxx> #include <sfx2/thumbnailviewitem.hxx> @@ -99,7 +99,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent) mpActionBar( new ToolBox(this, SfxResId(TBX_ACTION_ACTION))), mpTemplateBar( new ToolBox(this, SfxResId(TBX_ACTION_TEMPLATES))), mpSearchView(new TemplateSearchView(this)), - maView(new TemplateFolderView(this,SfxResId(TEMPLATE_VIEW))), + maView(new TemplateLocalView(this,SfxResId(TEMPLATE_VIEW))), mpOnlineView(new TemplateOnlineView(this, WB_VSCROLL,false)), mnSelectionCount(0), mxDesktop(comphelper::getProcessServiceFactory()->createInstance( "com.sun.star.frame.Desktop" ),uno::UNO_QUERY ) @@ -690,7 +690,7 @@ void SfxTemplateManagerDlg::OnTemplateImport () std::set<const ThumbnailViewItem*>::const_iterator pIter; for (pIter = maSelFolders.begin(); pIter != maSelFolders.end(); ++pIter) { - TemplateFolderViewItem *pFolder = (TemplateFolderViewItem*)(*pIter); + TemplateLocalViewItem *pFolder = (TemplateLocalViewItem*)(*pIter); for (size_t i = 0, n = aFiles.getLength(); i < n; ++i) maView->copyFrom(pFolder,aFiles[i]); |