[Libreoffice-commits] core.git: 3 commits - i18npool/source sc/source

[Eike Rathke]

 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |    4 +++-
 sc/source/core/data/document.cxx                                      |    8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 44e2da58226448c5617eac08ca2ae3d9a9ad2afa
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Apr 18 22:03:07 2016 +0200

    Resolves: tdf#99322 re-establish group area listeners after update reference
    
    Change-Id: If2ec5f938c7278ce817de3d89dc84cc0584507ac

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 39c8634..ead7178 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2593,6 +2593,14 @@ void ScDocument::CopyBlockFromClip(
                         SetInsertingFromOtherDoc( true);
                         aRefCxt.meMode = URM_MOVE;
                         UpdateReference(aRefCxt, rCxt.getUndoDoc(), false);
+
+                        // For URM_MOVE group listeners may have been removed,
+                        // re-establish them.
+                        /* TODO: actually only those in
+                         * sc::RefUpdateContext::maRegroupCols are affected,
+                         * come up with a start listeners that takes such. */
+                        StartNeededListeners();
+
                         SetInsertingFromOtherDoc( bOldInserting);
                     }
                 }
commit 332ffb5e84a114ac74d209da6eb1856fbba22b66
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Apr 18 19:15:38 2016 +0200

    check API call argument value
    
    Change-Id: I5eb0fbd6a6671c2cded38800c3223bccf0f7ff60

diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index d2b330e..dfec9cf 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -946,6 +946,9 @@ static const sal_Int32 nSupported_NumberingTypes = sizeof(aSupportedTypes) / siz
 OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index)
                                 throw(RuntimeException, std::exception)
 {
+    if (index < 0 || index >= nSupported_NumberingTypes)
+        throw RuntimeException();
+
     if (aSupportedTypes[index].cSymbol)
         return OUString(aSupportedTypes[index].cSymbol, strlen(aSupportedTypes[index].cSymbol), RTL_TEXTENCODING_UTF8);
     else {
commit 0d9e0eb6173cb47d8e311384f5aa79a6d10bfac5
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Apr 18 15:28:46 2016 +0200

    remove old commented out code
    
    Change-Id: I6871370341c8533e93f820e8f71ce09fe3d4d7be

diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index aa7ad1d..d2b330e 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -948,7 +948,6 @@ OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index)
 {
     if (aSupportedTypes[index].cSymbol)
         return OUString(aSupportedTypes[index].cSymbol, strlen(aSupportedTypes[index].cSymbol), RTL_TEXTENCODING_UTF8);
-    //            return OUString::createFromAscii(aSupportedTypes[index].cSymbol);
     else {
         OUString result;
         Locale aLocale(OUString("en"), OUString(), OUString());