diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-02-26 09:12:48 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-02-26 11:44:12 +0100 |
| commit | 4c9f01179be9325486047f02d9978d18c592afaa (patch) | |
| tree | 753e0408986e6466c2c172e1618f73543dff6aff | |
| parent | bd2e7b2a5bcb8f7838c7de828d0ecdd071ee4c64 (diff) | |
sw: Fix build with older boost::optional like 1.54
Change-Id: I2256a52e2017bfda04b3a2395f82b0aff0aa5b22
Reviewed-on: https://gerrit.libreoffice.org/50342
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/source/core/txtnode/txatbase.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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: |