diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-06 09:23:33 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-09 08:34:40 +0000 |
commit | 6c80a8fe89fadf9a2c7260a09c037a09462f53d1 (patch) | |
tree | d36da9ee2a5fdc579d2a57ff6ba02deaddfa785a /xmloff/source/chart | |
parent | e1fc599eb764186e5d511ace9785463eebbc7028 (diff) |
new loplugin: oncevar
Change-Id: If57390510dde4d166be3141b9f658a7453755d3f
Reviewed-on: https://gerrit.libreoffice.org/19815
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmloff/source/chart')
-rw-r--r-- | xmloff/source/chart/SchXMLExport.cxx | 34 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLImport.cxx | 18 |
2 files changed, 14 insertions, 38 deletions
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 01a9b21141e8..d7e02b83b873 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -917,8 +917,6 @@ void lcl_exportNumberFormat( const OUString& rPropertyName, const Reference< bea if( !xErrorBarDataSource.is()) return aResult; - const OUString aRolePrefix( "error-bars-" ); - Sequence< Reference< chart2::data::XLabeledDataSequence > > aSequences( xErrorBarDataSource->getDataSequences()); for( sal_Int32 nI=0; nI< aSequences.getLength(); ++nI ) @@ -931,7 +929,7 @@ void lcl_exportNumberFormat( const OUString& rPropertyName, const Reference< bea Reference< beans::XPropertySet > xSeqProp( xSequence, uno::UNO_QUERY_THROW ); OUString aRole; if( ( xSeqProp->getPropertyValue( "Role" ) >>= aRole ) && - aRole.match( aRolePrefix )) + aRole.match( "error-bars-" )) { aResult.push_back( xSequence ); } @@ -3720,9 +3718,7 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference< Sequence< OUString > SAL_CALL SchXMLExport_getSupportedServiceNames() throw() { - const OUString aServiceName( "com.sun.star.comp.Chart.XMLExporter" ); - const Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return Sequence< OUString > { "com.sun.star.comp.Chart.XMLExporter" }; } OUString SAL_CALL SchXMLExport_getImplementationName() throw() @@ -3739,9 +3735,7 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_createInstance(const Referenc // Oasis format Sequence< OUString > SAL_CALL SchXMLExport_Oasis_getSupportedServiceNames() throw() { - const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisExporter" ); - const Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisExporter" }; } OUString SAL_CALL SchXMLExport_Oasis_getImplementationName() throw() @@ -3761,9 +3755,7 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_createInstance(const Re Sequence< OUString > SAL_CALL SchXMLExport_Styles_getSupportedServiceNames() throw() { - const OUString aServiceName( "com.sun.star.comp.Chart.XMLStylesExporter" ); - const Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return Sequence< OUString > { "com.sun.star.comp.Chart.XMLStylesExporter" }; } OUString SAL_CALL SchXMLExport_Styles_getImplementationName() throw() @@ -3779,14 +3771,12 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Styles_createInstance(const R // Oasis format Sequence< OUString > SAL_CALL SchXMLExport_Oasis_Styles_getSupportedServiceNames() throw() { - const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisStylesExporter" ); - const Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisStylesExporter" }; } OUString SAL_CALL SchXMLExport_Oasis_Styles_getImplementationName() throw() { - return OUString( "SchXMLExport.Oasis.Styles" ); + return OUString( "SchXMLExport.Oasis.Styles" ); } Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) @@ -3796,9 +3786,7 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Styles_createInstance(c Sequence< OUString > SAL_CALL SchXMLExport_Content_getSupportedServiceNames() throw() { - const OUString aServiceName( "com.sun.star.comp.Chart.XMLContentExporter" ); - const Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return Sequence< OUString > { "com.sun.star.comp.Chart.XMLContentExporter" }; } OUString SAL_CALL SchXMLExport_Content_getImplementationName() throw() @@ -3814,9 +3802,7 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Content_createInstance(const // Oasis format Sequence< OUString > SAL_CALL SchXMLExport_Oasis_Content_getSupportedServiceNames() throw() { - const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisContentExporter" ); - const Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisContentExporter" }; } OUString SAL_CALL SchXMLExport_Oasis_Content_getImplementationName() throw() @@ -3832,9 +3818,7 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Content_createInstance( // Oasis format Sequence< OUString > SAL_CALL SchXMLExport_Oasis_Meta_getSupportedServiceNames() throw() { - const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisMetaExporter" ); - const Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisMetaExporter" }; } OUString SAL_CALL SchXMLExport_Oasis_Meta_getImplementationName() throw() diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index 2f7a58607b42..d144a650f899 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -658,9 +658,7 @@ void SAL_CALL SchXMLImport::setTargetDocument( const uno::Reference< lang::XComp Sequence< OUString > SAL_CALL SchXMLImport_getSupportedServiceNames() throw() { - const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisImporter" ); - const Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisImporter" }; } OUString SAL_CALL SchXMLImport_getImplementationName() throw() @@ -677,14 +675,12 @@ Reference< uno::XInterface > SAL_CALL SchXMLImport_createInstance(const Referenc Sequence< OUString > SAL_CALL SchXMLImport_Styles_getSupportedServiceNames() throw() { - const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisStylesImporter" ); - const Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisStylesImporter" }; } OUString SAL_CALL SchXMLImport_Styles_getImplementationName() throw() { - return OUString( "SchXMLImport.Styles" ); + return OUString( "SchXMLImport.Styles" ); } Reference< uno::XInterface > SAL_CALL SchXMLImport_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) @@ -694,9 +690,7 @@ Reference< uno::XInterface > SAL_CALL SchXMLImport_Styles_createInstance(const R Sequence< OUString > SAL_CALL SchXMLImport_Content_getSupportedServiceNames() throw() { - const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisContentImporter" ); - const Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisContentImporter" }; } OUString SAL_CALL SchXMLImport_Content_getImplementationName() throw() @@ -711,9 +705,7 @@ Reference< uno::XInterface > SAL_CALL SchXMLImport_Content_createInstance(const Sequence< OUString > SAL_CALL SchXMLImport_Meta_getSupportedServiceNames() throw() { - const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisMetaImporter" ); - const Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisMetaImporter" }; } OUString SAL_CALL SchXMLImport_Meta_getImplementationName() throw() |