[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - cui/source filter/source

[Andras Timar]

 cui/source/options/tsaurls.cxx  |    8 ++++----
 filter/source/pdf/impdialog.cxx |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 39a2fbda81d54f458a781b416a58c77a2a1ad6db
Author: Andras Timar <andras.ti...@collabora.com>
Date:   Wed Mar 11 05:49:38 2015 -0700

    gcc 4.4.7 (Cent OS 5) does not know auto iterators
    
    Change-Id: I03ab90c90448e456fc497fb082ad230a434f9f3a

diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index 9d228b6..521c924 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -37,9 +37,9 @@ TSAURLsDialog::TSAURLsDialog(Window* pParent)
     {
         css::uno::Sequence<OUString> 
aUserSetTSAURLs(officecfg::Office::Common::Security::Scripting::TSAURLs::get());
 
-        for (auto i = aUserSetTSAURLs.begin(); i != aUserSetTSAURLs.end(); ++i)
+        for (sal_Int32 i = 0; i < aUserSetTSAURLs.getLength(); ++i)
         {
-            AddTSAURL(*i);
+            AddTSAURL(aUserSetTSAURLs[i]);
         }
     }
     catch (const uno::Exception &e)
@@ -55,7 +55,7 @@ IMPL_LINK_NOARG(TSAURLsDialog, OKHdl_Impl)
     css::uno::Sequence<OUString> aNewValue(m_aURLs.size());
     size_t n(0);
 
-    for (auto i = m_aURLs.begin(); i != m_aURLs.end(); ++i)
+    for (std::set<OUString>::iterator i = m_aURLs.begin(); i != m_aURLs.end(); 
++i)
         aNewValue[n++] = *i;
     officecfg::Office::Common::Security::Scripting::TSAURLs::set(aNewValue, 
batch);
     batch->commit();
@@ -76,7 +76,7 @@ void TSAURLsDialog::AddTSAURL(const OUString& rURL)
     m_pURLListBox->SetUpdateMode(false);
     m_pURLListBox->Clear();
 
-    for (auto i = m_aURLs.begin(); i != m_aURLs.end(); ++i)
+    for (std::set<OUString>::iterator i = m_aURLs.begin(); i != m_aURLs.end(); 
++i)
     {
         m_pURLListBox->InsertEntry(*i);
     }
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 005dd2f..ccec924 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1577,9 +1577,9 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, 
ClickmaPbSignCertSelect )
         {
             css::uno::Sequence<OUString> 
aTSAURLs(officecfg::Office::Common::Security::Scripting::TSAURLs::get());
 
-            for (auto i = aTSAURLs.begin(); i != aTSAURLs.end(); ++i)
+            for (sal_Int32 i = 0; i < aTSAURLs.getLength(); ++i)
             {
-                mpLBSignTSA->InsertEntry( *i );
+                mpLBSignTSA->InsertEntry( aTSAURLs[i] );
             }
         }
         catch (const uno::Exception &e)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits