[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source

[Stephan Bergmann]

 sfx2/source/doc/templatedlg.cxx |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 60e8f1f5f44a140fc044d7178198adba5acbe32d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 26 17:35:01 2013 +0100

    quickfix
    
    Change-Id: Ida36d96982d869553452c8240da7dec363cee4b4
    Signed-off-by: Luboš Luňák <l.lunak at suse.cz>

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index c87030c..f993ecf 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)