diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:24:24 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:26 +0100 |
commit | 70217974e104ed5fcab415fdf04fd37c0cca3601 (patch) | |
tree | 77db1997e8399aeca7bbc3806a943672ae1f00ca /filter/source | |
parent | extensions: Use appropriate OUString functions on string constants (diff) | |
download | core-70217974e104ed5fcab415fdf04fd37c0cca3601.tar.gz core-70217974e104ed5fcab415fdf04fd37c0cca3601.zip |
filter: Use appropriate OUString functions on string constants
Change-Id: I9b8be418e8ac43eab27ef1f8a80ca09d66524810
Diffstat (limited to 'filter/source')
-rw-r--r-- | filter/source/config/cache/filterfactory.cxx | 2 | ||||
-rw-r--r-- | filter/source/flash/swfdialog.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/mstoolbar.cxx | 2 | ||||
-rw-r--r-- | filter/source/svg/svgdialog.cxx | 2 | ||||
-rw-r--r-- | filter/source/svg/svgexport.cxx | 22 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.cxx | 6 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertestdialog.cxx | 2 |
7 files changed, 19 insertions, 19 deletions
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 9f668cf9a50b..87b829093b44 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -325,7 +325,7 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize OUString sCheckValue = aFilter.getUnpackedValueOrDefault(PROPNAME_DOCUMENTSERVICE, OUString()); if ( (!sDocumentService.isEmpty() ) && - (!sDocumentService.equals(QUERY_CONSTVALUE_ALL)) && + (sDocumentService != QUERY_CONSTVALUE_ALL ) && (!sCheckValue.equals(sDocumentService) ) ) { diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index 3a77307fe223..981731ae642e 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -58,7 +58,7 @@ Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames() { Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( SERVICE_NAME ); + pArray[0] = SERVICE_NAME; return aRet; } diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index 328b828318d8..181630434d90 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -137,7 +137,7 @@ CustomToolBarImportHelper::createMenu( const OUString& rName, const uno::Referen { uno::Sequence< beans::PropertyValue > aPopupMenu( 4 ); aPopupMenu[0].Name = "CommandURL"; - aPopupMenu[0].Value = uno::makeAny( OUString("vnd.openoffice.org:") + rName ); + aPopupMenu[0].Value = uno::makeAny( "vnd.openoffice.org:" + rName ); aPopupMenu[1].Name = "Label"; aPopupMenu[1].Value <<= rName; aPopupMenu[2].Name = "ItemDescriptorContainer"; diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index cf715534a6bd..4cd266721a2b 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -57,7 +57,7 @@ Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames() { Sequence< OUString > aRet( 1 ); - aRet.getArray()[ 0 ] = OUString ( SVG_DIALOG_SERVICE_NAME ); + aRet.getArray()[ 0 ] = SVG_DIALOG_SERVICE_NAME; return aRet; } diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 678aa44c7f48..4b2676dfe2ac 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -239,25 +239,25 @@ public: { case SVXDATEFORMAT_STDSMALL: case SVXDATEFORMAT_A: // 13.02.96 - sDateFormat = ""; + sDateFormat.clear(); break; case SVXDATEFORMAT_C: // 13.Feb 1996 - sDateFormat = ""; + sDateFormat.clear(); break; case SVXDATEFORMAT_D: // 13.February 1996 - sDateFormat = ""; + sDateFormat.clear(); break; case SVXDATEFORMAT_E: // Tue, 13.February 1996 - sDateFormat = ""; + sDateFormat.clear(); break; case SVXDATEFORMAT_STDBIG: case SVXDATEFORMAT_F: // Tuesday, 13.February 1996 - sDateFormat = ""; + sDateFormat.clear(); break; // default case case SVXDATEFORMAT_B: // 13.02.1996 default: - sDateFormat = ""; + sDateFormat.clear(); break; } } @@ -268,20 +268,20 @@ public: switch( eTimeFormat ) { case SVXTIMEFORMAT_24_HMS: // 13:49:38 - sTimeFormat = ""; + sTimeFormat.clear(); break; case SVXTIMEFORMAT_AM_HM: // 01:49 PM case SVXTIMEFORMAT_12_HM: - sTimeFormat = ""; + sTimeFormat.clear(); break; case SVXTIMEFORMAT_AM_HMS: // 01:49:38 PM case SVXTIMEFORMAT_12_HMS: - sTimeFormat = ""; + sTimeFormat.clear(); break; // default case case SVXTIMEFORMAT_24_HM: // 13:49 default: - sTimeFormat = ""; + sTimeFormat.clear(); break; } } @@ -1119,7 +1119,7 @@ bool SVGFilter::implGenerateMetaData() { for( sal_Int32 i = 0, nSize = aFieldSet.size(); i < nSize; ++i ) { - OUString sElemId = OUString(aOOOElemTextField) + "_" + OUString::number( i ); + OUString sElemId = OUStringLiteral(aOOOElemTextField) + "_" + OUString::number( i ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sElemId ); aFieldSet[i]->elementExport( mpSVGExport ); } diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 3e9c2d580582..1ca787a20173 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -286,7 +286,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie } } else - rGradientId = ""; + rGradientId.clear(); } void SVGAttributeWriter::SetFontAttr( const vcl::Font& rFont ) @@ -1251,7 +1251,7 @@ void SVGTextWriter::startTextPosition( bool bExportX, bool bExportY ) { Point aRot( maTextPos ); OUString aTransform = - OUString("translate(") + OUString::number( aRot.X() ) + + "translate(" + OUString::number( aRot.X() ) + "," + OUString::number( aRot.Y() ) + ") rotate(" + OUString::number( rFont.GetOrientation() * -0.1 ) + ") translate(" + OUString::number( -aRot.X() ) + @@ -1279,7 +1279,7 @@ void SVGTextWriter::implExportHyperlinkIds() mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "HyperlinkIdList" ); SvXMLElementExport aDescElem( mrExport, XML_NAMESPACE_NONE, "desc", true, false ); mrExport.GetDocHandler()->characters( msHyperlinkIdList.trim() ); - msHyperlinkIdList = ""; + msHyperlinkIdList.clear(); } } diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 5acffd6b28ce..359300e31ea9 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -196,7 +196,7 @@ void XMLFilterTestDialog::test( const filter_info_impl& rFilterInfo ) delete m_pFilterInfo; m_pFilterInfo = new filter_info_impl( rFilterInfo ); - m_sImportRecentFile = ""; + m_sImportRecentFile.clear(); initDialog(); |