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

[Libreoffice Gerrit user]

 sw/source/core/swg/SwXMLTextBlocks.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ccf14962edf5cb1cf650363c876f6460e9403ccf
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jul 30 12:00:13 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jul 30 13:38:23 2018 +0200

    fix bug in SwXMLTextBlocks::CopyBlock
    
    would have created a name that looked like
    
       xxxx123456789101112
    
    etc, which is probably not what it wanted
    
    Change-Id: I4ebdf1444fc12d57762463075ca0dea2cc046dd7
    Reviewed-on: https://gerrit.libreoffice.org/58309
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index eed2272a3ad5..2f22f88f8b3d 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -238,7 +238,8 @@ ErrCode SwXMLTextBlocks::CopyBlock( SwImpBlocks& rDestImp, OUString& rShort,
     const OUString aGroup( rShort );
     bool bTextOnly = IsOnlyTextBlock ( rShort ) ;//pImp->pBlkRoot->IsStream( aGroup );
     sal_uInt16 nIndex = GetIndex ( rShort );
-    OUString sDestShortName( GetPackageName (nIndex) );
+    OUString sPackageName( GetPackageName (nIndex) );
+    OUString sDestShortName( sPackageName );
     sal_uInt16 nIdx = 0;
 
     OSL_ENSURE( xBlkRoot.is(), "No storage set" );
@@ -256,7 +257,7 @@ ErrCode SwXMLTextBlocks::CopyBlock( SwImpBlocks& rDestImp, OUString& rShort,
             rDestImp.CloseFile();
             return ERR_SWG_WRITE_ERROR;
         }
-        sDestShortName += OUString::number( nIdx );
+        sDestShortName = sPackageName + OUString::number( nIdx );
     }
 
     try