[Libreoffice-commits] .: 2 commits - sc/source sw/source

[Caolán McNamara]

 sc/source/ui/app/inputhdl.cxx     |    4 ++++
 sw/source/core/fields/docufld.cxx |    3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 2a48994be5501d2204793700f4a169ae455c6658
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Mar 8 16:01:09 2012 +0000

    different types in std::min on 32bit

diff --git a/sw/source/core/fields/docufld.cxx 
b/sw/source/core/fields/docufld.cxx
index 79233a1..b146f55 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2566,8 +2566,7 @@ const rtl::OUString& SwCombinedCharField::GetPar1() const
 
 void SwCombinedCharField::SetPar1(const rtl::OUString& rStr)
 {
-    sCharacters = rStr.copy(0, std::min(rStr.getLength(),
-                static_cast<sal_Int32>(MAX_COMBINED_CHARACTERS)));
+    sCharacters = rStr.copy(0, std::min<sal_Int32>(rStr.getLength(), 
MAX_COMBINED_CHARACTERS));
 }
 
 bool SwCombinedCharField::QueryValue( uno::Any& rAny,
commit a3f1614c606629196ca71dc22dab3343b060dced
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Mar 8 16:00:35 2012 +0000

    Resolves: fdo#46923 uninitialized iterators are invalid

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index d5a0868..29a40c5 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -722,7 +722,10 @@ void ScInputHandler::GetFormulaData()
         if ( pFormulaData )
             pFormulaData->clear();
         else
+        {
             pFormulaData = new ScTypedCaseStrSet;
+            miAutoPosFormula = pFormulaData->end();
+        }
 
         if( pFormulaDataPara )
             pFormulaDataPara->clear();
@@ -1524,6 +1527,7 @@ void ScInputHandler::GetColData()
         else
         {
             pColumnData = new ScTypedCaseStrSet;
+            miAutoPosColumn = pColumnData->end();
         }
 
         std::vector<ScTypedStrData> aEntries;

_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits