38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
|
Author: Adam Majer <amajer@suse.de>
|
||
|
|
Date: Sat Feb 17 12:13:32 CET 2018
|
||
|
|
|
||
|
|
Old boost seems to be missing some boost::optional functionality.
|
||
|
|
This patch is a simple fix for a few problem spots. If this
|
||
|
|
problem gets larger, it may need a more generic solution instead.
|
||
|
|
|
||
|
|
|
||
|
|
Index: libreoffice-6.0.1.1/sw/source/core/txtnode/txatbase.cxx
|
||
|
|
===================================================================
|
||
|
|
--- libreoffice-6.0.1.1.orig/sw/source/core/txtnode/txatbase.cxx
|
||
|
|
+++ libreoffice-6.0.1.1/sw/source/core/txtnode/txatbase.cxx
|
||
|
|
@@ -100,21 +100,21 @@ void SwTextAttr::dumpAsXml(xmlTextWriter
|
||
|
|
{
|
||
|
|
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:
|