summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-03-26 17:35:01 +0100
committerLuboš Luňák <l.lunak@suse.cz>2013-03-28 16:18:16 +0100
commit60e8f1f5f44a140fc044d7178198adba5acbe32d (patch)
tree97f08dace490231a7f6419177a96441fca79d89a /sfx2
parent2058479575e4a3e003eb1917c4f0947db9145623 (diff)
quickfix
Change-Id: Ida36d96982d869553452c8240da7dec363cee4b4 Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/templatedlg.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index c87030cc2013..f993ecf5e50f 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -842,7 +842,7 @@ void SfxTemplateManagerDlg::OnTemplateImport ()
if (aFiles.hasElements())
{
- std::set<const ThumbnailViewItem*>::const_iterator pIter;
+ std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator pIter;
for (pIter = maSelFolders.begin(); pIter != maSelFolders.end(); ++pIter)
{
OUString aTemplateList;
@@ -891,7 +891,7 @@ void SfxTemplateManagerDlg::OnTemplateExport()
{
sal_uInt16 i = 1;
- std::set<const ThumbnailViewItem*>::const_iterator pIter = maSelTemplates.begin();
+ std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator pIter = maSelTemplates.begin();
for (pIter = maSelTemplates.begin(); pIter != maSelTemplates.end(); ++pIter, ++i)
{
const TemplateSearchViewItem *pItem = static_cast<const TemplateSearchViewItem*>(*pIter);
@@ -923,7 +923,7 @@ void SfxTemplateManagerDlg::OnTemplateExport()
sal_uInt16 i = 1;
sal_uInt16 nRegionItemId = maView->getCurRegionId() + 1;
- std::set<const ThumbnailViewItem*>::const_iterator pIter = maSelTemplates.begin();
+ std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator pIter = maSelTemplates.begin();
for (pIter = maSelTemplates.begin(); pIter != maSelTemplates.end(); ++pIter, ++i)
{
const TemplateViewItem *pItem = static_cast<const TemplateViewItem*>(*pIter);
@@ -1010,7 +1010,7 @@ void SfxTemplateManagerDlg::OnTemplateEdit ()
aArgs[2].Value <<= UpdateDocMode::ACCORDING_TO_CONFIG;
uno::Reference< XStorable > xStorable;
- std::set<const ThumbnailViewItem*>::const_iterator pIter;
+ std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator pIter;
for (pIter = maSelTemplates.begin(); pIter != maSelTemplates.end(); ++pIter)
{
const TemplateViewItem *pItem = static_cast<const TemplateViewItem*>(*pIter);
@@ -1044,7 +1044,7 @@ void SfxTemplateManagerDlg::OnTemplateDelete ()
if (mpSearchView->IsVisible())
{
- std::set<const ThumbnailViewItem*>::const_iterator pIter;
+ std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator pIter;
for (pIter = maSelTemplates.begin(); pIter != maSelTemplates.end();)
{
const TemplateSearchViewItem *pItem =
@@ -1078,7 +1078,7 @@ void SfxTemplateManagerDlg::OnTemplateDelete ()
}
else
{
- std::set<const ThumbnailViewItem*>::const_iterator pIter;
+ std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator pIter;
for (pIter = maSelTemplates.begin(); pIter != maSelTemplates.end();)
{
if (maView->removeTemplate((*pIter)->mnId,maView->getCurRegionId()+1))
@@ -1135,7 +1135,7 @@ void SfxTemplateManagerDlg::OnFolderDelete()
OUString aFolderList;
- std::set<const ThumbnailViewItem*>::const_iterator pIter;
+ std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator pIter;
for (pIter = maSelFolders.begin(); pIter != maSelFolders.end();)
{
if (maView->removeRegion((*pIter)->mnId))
@@ -1215,7 +1215,7 @@ void SfxTemplateManagerDlg::OnTemplateSaveAs()
}
else
{
- std::set<const ThumbnailViewItem*>::const_iterator pIter;
+ std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator pIter;
for (pIter = maSelFolders.begin(); pIter != maSelFolders.end(); ++pIter)
{
TemplateContainerItem *pItem = (TemplateContainerItem*)(*pIter);
@@ -1347,7 +1347,7 @@ void SfxTemplateManagerDlg::localMoveTo(sal_uInt16 nMenuId)
{
OUString aTemplateList;
- std::set<const ThumbnailViewItem*>::const_iterator pIter;
+ std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator pIter;
for (pIter = maSelFolders.begin(); pIter != maSelFolders.end(); ++pIter)
{
if (aTemplateList.isEmpty())
@@ -1391,7 +1391,7 @@ void SfxTemplateManagerDlg::remoteMoveTo(const sal_uInt16 nMenuId)
{
OUString aTemplateList;
- std::set<const ThumbnailViewItem*>::const_iterator aIter;
+ std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator aIter;
for (aIter = maSelTemplates.begin(); aIter != maSelTemplates.end(); ++aIter)
{
const TemplateSearchViewItem *pItem =
@@ -1447,7 +1447,7 @@ void SfxTemplateManagerDlg::localSearchMoveTo(sal_uInt16 nMenuId)
// Move templates to desired folder if for some reason move fails
// try copying them.
- std::set<const ThumbnailViewItem*>::const_iterator aIter;
+ std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator aIter;
std::set<const ThumbnailViewItem*,selection_cmp_fn> aSelTemplates = maSelTemplates; //Copy to avoid invalidating an iterator
for (aIter = aSelTemplates.begin(); aIter != aSelTemplates.end(); ++aIter)