[Libreoffice-commits] core.git: 2 commits - basctl/source basic/source

[Stephan Bergmann]

 basctl/source/basicide/basides2.cxx |    9 ++++-----
 basic/source/runtime/runtime.cxx    |    9 +++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit e27a0ec89f6d13be0ddf4d68b844a78f939f7bf9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 20 11:19:32 2016 +0200

    Related cid#1371289: Improve code to not depend on missing move assignment
    
    Change-Id: Id254fa76cafe33a36646d517d224ba6a05406c09

diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 1fba866..6082437 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -2019,18 +2019,19 @@ void SbiRuntime::StepLSET()
 
         sal_Int32 nVarStrLen = aRefVarString.getLength();
         sal_Int32 nValStrLen = aRefValString.getLength();
-        OUStringBuffer aNewStr;
+        OUString aNewStr;
         if( nVarStrLen > nValStrLen )
         {
-            aNewStr.append(aRefValString);
-            comphelper::string::padToLength(aNewStr, nVarStrLen, ' ');
+            OUStringBuffer buf(aRefValString);
+            comphelper::string::padToLength(buf, nVarStrLen, ' ');
+            aNewStr = buf.makeStringAndClear();
         }
         else
         {
             aNewStr = aRefValString.copy( 0, nVarStrLen );
         }
 
-        refVar->PutString(aNewStr.makeStringAndClear());
+        refVar->PutString(aNewStr);
         refVar->SetFlags( n );
     }
 }
commit cf62e6c1d87bdee8021351cefaedec0796e15c90
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 20 11:19:18 2016 +0200

    Related cid#1371289: Improve code to not depend on missing move assignment
    
    Change-Id: I332010574a2ddd13590452f08da32f21f8ef882b

diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 98c0dfb..40bd5c4 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -96,21 +96,20 @@ sal_uInt16 Shell::SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags )
 
 void Shell::SetMDITitle()
 {
-    OUStringBuffer aTitleBuf;
+    OUString aTitle;
     if ( !m_aCurLibName.isEmpty() )
     {
         LibraryLocation eLocation = m_aCurDocument.getLibraryLocation( m_aCurLibName );
-        aTitleBuf = m_aCurDocument.getTitle(eLocation) + "." + m_aCurLibName ;
+        aTitle = m_aCurDocument.getTitle(eLocation) + "." + m_aCurLibName ;
     }
     else
-        aTitleBuf = IDE_RESSTR(RID_STR_ALL) ;
+        aTitle = IDE_RESSTR(RID_STR_ALL) ;
 
     DocumentSignature aCurSignature( m_aCurDocument );
     if ( aCurSignature.getScriptingSignatureState() == SignatureState::OK )
     {
-        aTitleBuf = aTitleBuf + " " + IDE_RESSTR(RID_STR_SIGNED) + " ";
+        aTitle += " " + IDE_RESSTR(RID_STR_SIGNED) + " ";
     }
-    OUString aTitle(aTitleBuf.makeStringAndClear());
 
     SfxViewFrame* pViewFrame = GetViewFrame();
     if ( pViewFrame )