[Libreoffice-commits] core.git: sd/source

[Caolán McNamara]

 sd/source/core/sdpage2.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 8461c405983bbb887fc05d0952d0b4312a02e2e2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 19 10:37:30 2013 +0100

    aOldFullName and aFullName are both supposed to be prefixed the same
    
    i.e. a2b86b5fb75925e7e8b24751f83e1ecc8584cf72 stuck the prefix
    onto aFullName twice by accident
    
    Change-Id: I3fdba4cf3dea77bad2278812d75788f175e8d221

diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index da7791d..77d6e61 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -161,11 +161,10 @@ void SdPage::SetPresentationLayout(const OUString& rLayoutName,
 
                 for (sal_Int16 i = -1; i < 9; i++)
                 {
-                    aOldFullName = aOldLayoutName;
-                    aFullName = maLayoutName + " " +
-                                OUString::number( (sal_Int32) (i <= 0 ) ? 1 : i + 1) +
-                                " " +
+                    aOldFullName = aOldLayoutName + " " +
                                 OUString::number( (sal_Int32) (i <= 0 ) ? 1 : i + 1 );
+                    aFullName = maLayoutName + " " +
+                                OUString::number( (sal_Int32) (i <= 0 ) ? 1 : i + 1);
                     pSheet = pStShPool->Find(aOldFullName, SD_STYLE_FAMILY_MASTERPAGE);
                     DBG_ASSERT(pSheet, "Old outline style sheet not found");
                     aOldOutlineStyles.push_back(pSheet);