[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - i18npool/source sd/source

[Michael Stahl]

 i18npool/source/localedata/localedata.cxx               |    2 +-
 sd/source/ui/slidesorter/controller/SlsPageSelector.cxx |    5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 03d44c7670413b730b1445eeab5210cff8245786
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Aug 11 22:24:54 2014 +0200

    fdo#81995: fix Outline numbering tab page
    
    The "ParentNumbering" property is not a string.
    
    (regression from 97eb8a6e0eb830f37dcba64a51d725aab4c5ff53)
    
    Change-Id: Ib33e95847b388bb1126a63812e128c96a0c00730
    (cherry picked from commit 4d3c9ed257e51af55f358d2b44d5fc2e341c7202)
    Reviewed-on: https://gerrit.libreoffice.org/10874
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index bcd087f..212b626 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1585,7 +1585,7 @@ Any OutlineNumbering::getByIndex( sal_Int32 nIndex )
     pValues[4].Name = "BulletFontName";
     pValues[4].Value <<= pTemp->sBulletFontName;
     pValues[5].Name = "ParentNumbering";
-    pValues[5].Value <<= OUString::number(pTemp->nParentNumbering);
+    pValues[5].Value <<= pTemp->nParentNumbering;
     pValues[6].Name = "LeftMargin";
     pValues[6].Value <<= pTemp->nLeftMargin;
     pValues[7].Name = "SymbolTextDistance";
commit 57de7defc7baf03b0ae3574fa453009f201a2fd1
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Aug 11 16:44:37 2014 +0200

    fdo#81933 do not select 1st slide unconditionally
    
    This is a regression from commit
    ad0c4bf5790546242884da0c2ec281f2db9e14a0 . But I do not see why this
    code would be needed for that either.
    
    Change-Id: Ied3a5d25b2bec9542aa83c4d7fa36ed5313fc797
    (cherry picked from commit 904fdac93b072cc5295cce0360f47926f049e6ea)
    Reviewed-on: https://gerrit.libreoffice.org/10869
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
index 1484159..3524870 100644
--- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
@@ -388,11 +388,6 @@ void PageSelector::UpdateCurrentPage (const bool bUpdateOnlyWhenPending)
             break;
         }
     }
-    if ( ! pCurrentPageDescriptor && nPageCount>0)
-    {
-        // No page is selected.  Make the first slide the current page.
-        pCurrentPageDescriptor = mrModel.GetPageDescriptor(0);
-    }
 
     if (pCurrentPageDescriptor)
     {