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

[Rico Tzschichholz]

 sw/source/core/txtnode/txatbase.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e075d09557e4637273de03f2f018d95e91b05455
Author: Rico Tzschichholz <ric...@ubuntu.com>
Date:   Mon Feb 26 09:12:48 2018 +0100

    sw: Fix build with older boost::optional like 1.54
    
    Change-Id: I2256a52e2017bfda04b3a2395f82b0aff0aa5b22
    Reviewed-on: https://gerrit.libreoffice.org/50343
    Reviewed-by: Michael Stahl <mst...@redhat.com>
    Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/sw/source/core/txtnode/txatbase.cxx 
b/sw/source/core/txtnode/txatbase.cxx
index 5c53ba78faca..82015ad57df2 100644
--- a/sw/source/core/txtnode/txatbase.cxx
+++ b/sw/source/core/txtnode/txatbase.cxx
@@ -100,21 +100,21 @@ void SwTextAttr::dumpAsXml(xmlTextWriterPtr pWriter) const
         {
             pWhich = "character format";
             if (SwCharFormat* pCharFormat = GetCharFormat().GetCharFormat())
-                oValue = "name: " + OUStringToOString(pCharFormat->GetName(), 
RTL_TEXTENCODING_UTF8);
+                oValue = OString("name: " + 
OUStringToOString(pCharFormat->GetName(), RTL_TEXTENCODING_UTF8));
             break;
         }
     case RES_TXTATR_INETFMT:
         {
             pWhich = "inet format";
             const SwFormatINetFormat& rFormat = GetINetFormat();
-            oValue = "url: " + rFormat.GetValue().toUtf8();
+            oValue = OString("url: " + rFormat.GetValue().toUtf8());
             break;
         }
     case RES_TXTATR_CJK_RUBY:
         {
             pWhich = "ruby";
             const SwFormatRuby& rFormat = GetRuby();
-            oValue = "rubytext: " + rFormat.GetText().toUtf8();
+            oValue = OString("rubytext: " + rFormat.GetText().toUtf8());
             break;
         }
     case RES_TXTATR_META:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits