From 24531a040ea90a8631699089118a9e88860a27ee Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 18 Dec 2014 13:39:42 +0100 Subject: writerfilter: Use appropriate OUString functions on string constants Change-Id: I42d89d0cc8bf9e9a0918345147ae2f64b5aabf58 --- writerfilter/source/dmapper/CellColorHandler.cxx | 2 +- writerfilter/source/dmapper/DomainMapper.cxx | 2 +- writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 +- writerfilter/source/dmapper/ThemeTable.cxx | 4 ++-- writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 2 +- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 6 +++--- writerfilter/source/rtftok/rtfsdrimport.cxx | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) (limited to 'writerfilter/source') diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx index 632bc0764498..3c8b5060a229 100644 --- a/writerfilter/source/dmapper/CellColorHandler.cxx +++ b/writerfilter/source/dmapper/CellColorHandler.cxx @@ -303,7 +303,7 @@ beans::PropertyValue CellColorHandler::getInteropGrabBag() void CellColorHandler::disableInteropGrabBag() { - m_aInteropGrabBagName = ""; + m_aInteropGrabBagName.clear(); m_aInteropGrabBag.clear(); } diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 2397bd30e742..ec5afab1440a 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3415,7 +3415,7 @@ beans::PropertyValue DomainMapper::getInteropGrabBag() *pSeq++ = *i; m_pImpl->m_aInteropGrabBag.clear(); - m_pImpl->m_aInteropGrabBagName = ""; + m_pImpl->m_aInteropGrabBagName.clear(); aRet.Value = uno::makeAny(aSeq); return aRet; } diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index b26a29fe9b62..59fff49dc589 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4995,7 +4995,7 @@ void DomainMapper_Impl::enableInteropGrabBag(const OUString& aName) void DomainMapper_Impl::disableInteropGrabBag() { - m_aInteropGrabBagName = ""; + m_aInteropGrabBagName.clear(); m_aInteropGrabBag.clear(); m_aSubInteropGrabBag.clear(); } diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx index cb33e3a329c0..83a4d98127cb 100644 --- a/writerfilter/source/dmapper/ThemeTable.cxx +++ b/writerfilter/source/dmapper/ThemeTable.cxx @@ -88,7 +88,7 @@ void ThemeTable::lcl_attribute(Id Name, Value & val) if(m_pImpl->m_supplementalFontId && m_pImpl->m_supplementalFontName.getLength() > 0) { m_pImpl->m_currentFontThemeEntry[m_pImpl->m_supplementalFontId] = m_pImpl->m_supplementalFontName; - m_pImpl->m_supplementalFontName = ""; + m_pImpl->m_supplementalFontName.clear(); m_pImpl->m_supplementalFontId = 0; } } @@ -100,7 +100,7 @@ void ThemeTable::lcl_sprm(Sprm& rSprm) dmapper_logger->chars(rSprm.toString()); #endif - m_pImpl->m_supplementalFontName = ""; + m_pImpl->m_supplementalFontName.clear(); m_pImpl->m_supplementalFontId = 0; sal_uInt32 nSprmId = rSprm.getId(); diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx index 6ba07a07941a..f755c202e4bd 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx @@ -130,7 +130,7 @@ bool OOXMLStreamImpl::lcl_getTarget(uno::Reference // use '/' to representent the root of the zip package ( and provide a 'file' scheme to // keep the XUriReference implementation happy ) // add mspath to represent the 'source' of this stream - uno::Reference< com::sun::star::uri::XUriReference > xBase = xFac->parse( OUString( "file:///" ) + msPath ); + uno::Reference< com::sun::star::uri::XUriReference > xBase = xFac->parse( "file:///" + msPath ); static const char sType[] = "Type"; static const char sDocumentType[] = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument"; 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()))); + aFillModel.moColor.set("#" + OUString::fromUtf8(msfilter::util::ConvertColor(aAny.get()))); } 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"); -- cgit