[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

Stephan Bergmann sbergman at redhat.com
Wed Feb 12 02:56:32 PST 2014


 sw/source/core/unocore/unostyle.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a682fd572a2056eaaed9443bad70303879c4eec4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 11 17:28:43 2014 +0100

    Do not reference a dangling OUString
    
    (cherry picked from commit 151f3d665581d887cda1e36b817afb124c5c789e)
    Conflicts:
    	sw/source/core/unocore/unostyle.cxx
    
    Change-Id: I0908d1300d0d1acb515345ccbdf6cdc2bf44d6a5
    Reviewed-on: https://gerrit.libreoffice.org/8008
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 1631a49..47b1acb 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1588,7 +1588,7 @@ struct SwStyleBase_Impl
     rtl::Reference< SwDocStyleSheet > mxNewBase;
     SfxItemSet*         pItemSet;
 
-    const String&       rStyleName;
+    String       rStyleName;
 
     SwStyleBase_Impl(SwDoc& rSwDoc, const String& rName) :
         rDoc(rSwDoc),


More information about the Libreoffice-commits mailing list