diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:39:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:38 +0100 |
| commit | 24531a040ea90a8631699089118a9e88860a27ee (patch) | |
| tree | a5faff050475ab30eaebbc58d091142674dae9b7 /writerfilter/source/rtftok | |
| parent | 56d479f5405cf018bf233879387dbad851d279f2 (diff) | |
writerfilter: Use appropriate OUString functions on string constants
Change-Id: I42d89d0cc8bf9e9a0918345147ae2f64b5aabf58
Diffstat (limited to 'writerfilter/source/rtftok')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index babc26612cb1..433bbf96b5e6 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -349,12 +349,12 @@ void RTFDocumentImpl::resolveSubstream(sal_Size nPos, Id nId, OUString& rIgnoreF if (!m_aAuthor.isEmpty()) { pImpl->setAuthor(m_aAuthor); - m_aAuthor = ""; + m_aAuthor.clear(); } if (!m_aAuthorInitials.isEmpty()) { pImpl->setAuthorInitials(m_aAuthorInitials); - m_aAuthorInitials = ""; + m_aAuthorInitials.clear(); } pImpl->m_nDefaultFontIndex = m_nDefaultFontIndex; pImpl->seek(nPos); @@ -1272,7 +1272,7 @@ void RTFDocumentImpl::text(OUString& rString) if (!m_aIgnoreFirst.isEmpty() && m_aIgnoreFirst.equals(rString)) { - m_aIgnoreFirst = ""; + m_aIgnoreFirst.clear(); return; } diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 3f3969004d1a..b99d9687f395 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -354,11 +354,11 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap xPropertySet->setPropertyValue("FillColor", aAny); // fillType will decide, possible it'll be the start color of a gradient. - aFillModel.moColor.set(OUString("#") + OUString::fromUtf8(msfilter::util::ConvertColor(aAny.get<sal_Int32>()))); + aFillModel.moColor.set("#" + OUString::fromUtf8(msfilter::util::ConvertColor(aAny.get<sal_Int32>()))); } else if (i->first == "fillBackColor") // fillType will decide, possible it'll be the end color of a gradient. - aFillModel.moColor2.set(OUString("#") + OUString::fromUtf8(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32())))); + aFillModel.moColor2.set("#" + OUString::fromUtf8(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32())))); else if (i->first == "lineColor") aLineColor <<= msfilter::util::BGRToRGB(i->second.toInt32()); else if (i->first == "lineBackColor") @@ -561,7 +561,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap aShadowModel.mbHasShadow = true; } else if (i->first == "shadowColor") - aShadowModel.moColor.set(OUString("#") + OUString::fromUtf8(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32())))); + aShadowModel.moColor.set("#" + OUString::fromUtf8(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32())))); else if (i->first == "shadowOffsetX") // EMUs to points aShadowModel.moOffset.set(OUString::number(i->second.toDouble() / 12700) + "pt"); |