From 04bfdc0a82c306dbe16e7d79e78f2b1c8fd05475 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 31 Oct 2016 10:28:18 +0200 Subject: loplugin:oncevar in vbahelper..writerfilter Change-Id: Ifd7e91753d9652d6b1c535cde3cddf74757a2483 Reviewed-on: https://gerrit.libreoffice.org/30430 Tested-by: Jenkins Reviewed-by: Noel Grandin --- writerfilter/source/dmapper/DomainMapper_Impl.cxx | 12 ++++-------- writerfilter/source/dmapper/FormControlHelper.cxx | 5 +---- writerfilter/source/dmapper/OLEHandler.cxx | 3 +-- 3 files changed, 6 insertions(+), 14 deletions(-) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index be369fa7a0af..1408a62b59b5 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1348,10 +1348,9 @@ void DomainMapper_Impl::appendTextContent( void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const OLEHandlerPtr& pOLEHandler ) { - static const char sEmbeddedService[] = "com.sun.star.text.TextEmbeddedObject"; try { - uno::Reference< text::XTextContent > xOLE( m_xTextFactory->createInstance(sEmbeddedService), uno::UNO_QUERY_THROW ); + uno::Reference< text::XTextContent > xOLE( m_xTextFactory->createInstance("com.sun.star.text.TextEmbeddedObject"), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xOLEProperties(xOLE, uno::UNO_QUERY_THROW); OUString aCLSID = pOLEHandler->getCLSID(m_xComponentContext); @@ -1419,10 +1418,9 @@ void DomainMapper_Impl::appendStarMath( const Value& val ) val.getAny() >>= formula; if( formula.is() ) { - static const char sEmbeddedService[] = "com.sun.star.text.TextEmbeddedObject"; try { - uno::Reference< text::XTextContent > xStarMath( m_xTextFactory->createInstance(sEmbeddedService), uno::UNO_QUERY_THROW ); + uno::Reference< text::XTextContent > xStarMath( m_xTextFactory->createInstance("com.sun.star.text.TextEmbeddedObject"), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xStarMathProperties(xStarMath, uno::UNO_QUERY_THROW); xStarMathProperties->setPropertyValue(getPropertyName( PROP_EMBEDDED_OBJECT ), @@ -1470,8 +1468,7 @@ uno::Reference< beans::XPropertySet > DomainMapper_Impl::appendTextSectionAfter( xCursor->gotoEnd( true ); //the paragraph after this new section is already inserted xCursor->goLeft(1, true); - static const char sSectionService[] = "com.sun.star.text.TextSection"; - uno::Reference< text::XTextContent > xSection( m_xTextFactory->createInstance(sSectionService), uno::UNO_QUERY_THROW ); + uno::Reference< text::XTextContent > xSection( m_xTextFactory->createInstance("com.sun.star.text.TextSection"), uno::UNO_QUERY_THROW ); xSection->attach( uno::Reference< text::XTextRange >( xCursor, uno::UNO_QUERY_THROW) ); xRet.set(xSection, uno::UNO_QUERY ); } @@ -4629,10 +4626,9 @@ void DomainMapper_Impl::StartOrEndBookmark( const OUString& rId ) { if( aBookmarkIter != m_aBookmarkMap.end() ) { - static const char sBookmarkService[] = "com.sun.star.text.Bookmark"; if (m_xTextFactory.is()) { - uno::Reference< text::XTextContent > xBookmark( m_xTextFactory->createInstance( sBookmarkService ), uno::UNO_QUERY_THROW ); + uno::Reference< text::XTextContent > xBookmark( m_xTextFactory->createInstance( "com.sun.star.text.Bookmark" ), uno::UNO_QUERY_THROW ); uno::Reference< text::XTextCursor > xCursor; uno::Reference< text::XText > xText = aBookmarkIter->second.m_xTextRange->getText(); if( aBookmarkIter->second.m_bIsStartOfText && !bIsAfterDummyPara) diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx index 93c3ae0e9360..f4efa9011ed5 100644 --- a/writerfilter/source/dmapper/FormControlHelper.cxx +++ b/writerfilter/source/dmapper/FormControlHelper.cxx @@ -258,16 +258,13 @@ void FormControlHelper::insertControl(uno::Reference const& xT if (! xFormComps.is()) return; - static const char sControl[] = "Control"; - sal_Int32 nControl = 0; bool bDone = false; OUString sControlName; do { - OUString sTmp(sControl); - sTmp += OUString::number(nControl); + OUString sTmp = "Control" + OUString::number(nControl); nControl++; if (! xFormCompsByName->hasByName(sTmp)) diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx index 13ea16ecfebf..26f12c109f1d 100644 --- a/writerfilter/source/dmapper/OLEHandler.cxx +++ b/writerfilter/source/dmapper/OLEHandler.cxx @@ -273,9 +273,8 @@ OUString OLEHandler::copyOLEOStream( ::oox::ole::SaveInteropProperties(xTextDocument, aURL, nullptr, m_sProgId, m_sDrawAspect); - static const char sProtocol[] = "vnd.sun.star.EmbeddedObject:"; OUString aPersistName( xEmbeddedResolver->resolveEmbeddedObjectURL( aURL ) ); - sRet = aPersistName.copy( strlen(sProtocol) ); + sRet = aPersistName.copy( strlen("vnd.sun.star.EmbeddedObject:") ); } uno::Reference< lang::XComponent > xComp( xEmbeddedResolver, uno::UNO_QUERY_THROW ); -- cgit