diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-06 09:35:47 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-06 09:35:47 +0100 |
commit | 8cff2e85e97b4059eda5b2ac126480085b170a79 (patch) | |
tree | a7ae3f0cba19217bfc02be4613f1a07391197878 /extensions | |
parent | 4770941171b0139c79b222b0754beca6bdc7162b (diff) |
loplugin:stringconstant: elide explicit ctor usage (automatic rewrite)
Change-Id: Ia91f035c188fa99cdf0b9e80cb256e1b86f00551
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/qa/update/test_update.cxx | 16 | ||||
-rw-r--r-- | extensions/source/abpilot/abpfinalpage.cxx | 2 | ||||
-rw-r--r-- | extensions/source/abpilot/unodialogabp.cxx | 2 | ||||
-rw-r--r-- | extensions/source/dbpilots/commonpagesdbp.cxx | 2 | ||||
-rw-r--r-- | extensions/source/logging/logger.cxx | 2 | ||||
-rw-r--r-- | extensions/source/plugin/base/manager.cxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserline.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/inspectormodelbase.cxx | 8 | ||||
-rw-r--r-- | extensions/source/propctrlr/usercontrol.cxx | 2 | ||||
-rw-r--r-- | extensions/source/scanner/sanedlg.cxx | 2 |
11 files changed, 22 insertions, 22 deletions
diff --git a/extensions/qa/update/test_update.cxx b/extensions/qa/update/test_update.cxx index 4453c1157c1f..a434b580ef38 100644 --- a/extensions/qa/update/test_update.cxx +++ b/extensions/qa/update/test_update.cxx @@ -101,11 +101,11 @@ protected: rtl::Reference< UpdateCheck > aController( UpdateCheck::get() ); if ( checkForUpdates( aInfo, m_xContext, aController->getInteractionHandler(), m_xProvider, - OUString( "Linux" ), - OUString( "x86" ), + "Linux", + "x86", m_aRepositoryList, - OUString( "111111-222222-333333-444444" ), - OUString( "InstallSetID" ) ) ) + "111111-222222-333333-444444", + "InstallSetID" ) ) { CPPUNIT_ASSERT( aInfo.Sources.size() == 1 ); CPPUNIT_ASSERT( aInfo.Sources[0].URL == "http://www.libreoffice.org/download/" ); @@ -121,11 +121,11 @@ protected: rtl::Reference< UpdateCheck > aController( UpdateCheck::get() ); if ( checkForUpdates( aInfo, m_xContext, aController->getInteractionHandler(), m_xProvider, - OUString( "Linux" ), - OUString( "x86" ), + "Linux", + "x86", m_aRepositoryList, - OUString( "123456-abcdef-1a2b3c-4d5e6f" ), - OUString( "InstallSetID" ) ) ) + "123456-abcdef-1a2b3c-4d5e6f", + "InstallSetID" ) ) { CPPUNIT_ASSERT( aInfo.Sources.empty() ); } diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index c115698d5031..d51c35678aff 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -37,7 +37,7 @@ namespace abp const SfxFilter* lcl_getBaseFilter() { - const SfxFilter* pFilter = SfxFilter::GetFilterByName(OUString("StarOffice XML (Base)")); + const SfxFilter* pFilter = SfxFilter::GetFilterByName("StarOffice XML (Base)"); OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); return pFilter; } diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index d81eec0c1fac..40c7c550b3cb 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -44,7 +44,7 @@ namespace abp OABSPilotUno::OABSPilotUno(const Reference< XComponentContext >& _rxORB) :OGenericUnoDialog(_rxORB) { - registerProperty( OUString("DataSourceName"), PROPERTY_ID_DATASOURCENAME, PropertyAttribute::READONLY , + registerProperty( "DataSourceName", PROPERTY_ID_DATASOURCENAME, PropertyAttribute::READONLY , &m_sDataSourceName, cppu::UnoType<decltype(m_sDataSourceName)>::get() ); } diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index e8850fc7d0ba..e0e01c3f2f0d 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -199,7 +199,7 @@ namespace dbp ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0); aFileDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() ); - const SfxFilter* pFilter = SfxFilter::GetFilterByName(OUString("StarOffice XML (Base)")); + const SfxFilter* pFilter = SfxFilter::GetFilterByName("StarOffice XML (Base)"); OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); if ( pFilter ) { diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx index 47bd043160d8..2bafe5a625a8 100644 --- a/extensions/source/logging/logger.cxx +++ b/extensions/source/logging/logger.cxx @@ -313,7 +313,7 @@ namespace logging Reference< XLogger > SAL_CALL LoggerPool::getDefaultLogger( ) throw (RuntimeException, std::exception) { - return getNamedLogger( OUString( "org.openoffice.logging.DefaultLogger" ) ); + return getNamedLogger( "org.openoffice.logging.DefaultLogger" ); } void createRegistryInfo_LoggerPool() diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index 231ab0ef4993..8b1d120733e7 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -176,8 +176,8 @@ Sequence<css::plugin::PluginDescription> XPluginManager_Impl::getPluginDescripti Sequence<css::plugin::PluginDescription> aRet; vcl::SettingsConfigItem* pCfg = vcl::SettingsConfigItem::get(); - OUString aVal( pCfg->getValue( OUString( "BrowserPlugins" ), - OUString( "Disabled" ) ) ); + OUString aVal( pCfg->getValue( "BrowserPlugins", + "Disabled" ) ); if( ! aVal.toBoolean() ) { aRet = impl_getPluginDescriptions(); diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 1e0338596559..e6469ee282fb 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -379,7 +379,7 @@ namespace pcr rpButton = VclPtr<PushButton>::Create( m_pTheParent, WB_NOPOINTERFOCUS ); rpButton->SetGetFocusHdl( LINK( this, OBrowserLine, OnButtonFocus ) ); rpButton->SetClickHdl( LINK( this, OBrowserLine, OnButtonClicked ) ); - rpButton->SetText(OUString("...")); + rpButton->SetText("..."); } rpButton->Show(); diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index a5f49336d4d1..8363eae44878 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2903,7 +2903,7 @@ namespace pcr // is considered to be potentially expensive aFileDlg.SetDisplayDirectory( sDataSource ); - const SfxFilter* pFilter = SfxFilter::GetFilterByName(OUString("StarOffice XML (Base)")); + const SfxFilter* pFilter = SfxFilter::GetFilterByName("StarOffice XML (Base)"); OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); if ( pFilter ) { diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx index 8d682c5f041f..1b26b2054da0 100644 --- a/extensions/source/propctrlr/inspectormodelbase.cxx +++ b/extensions/source/propctrlr/inspectormodelbase.cxx @@ -99,25 +99,25 @@ namespace pcr ,m_bIsReadOnly( false ) { registerProperty( - OUString( "HasHelpSection" ), + "HasHelpSection", MODEL_PROPERTY_ID_HAS_HELP_SECTION, PropertyAttribute::READONLY, &m_bHasHelpSection, cppu::UnoType<decltype(m_bHasHelpSection)>::get() ); registerProperty( - OUString( "MinHelpTextLines" ), + "MinHelpTextLines", MODEL_PROPERTY_ID_MIN_HELP_TEXT_LINES, PropertyAttribute::READONLY, &m_nMinHelpTextLines, cppu::UnoType<decltype(m_nMinHelpTextLines)>::get() ); registerProperty( - OUString( "MaxHelpTextLines" ), + "MaxHelpTextLines", MODEL_PROPERTY_ID_MAX_HELP_TEXT_LINES, PropertyAttribute::READONLY, &m_nMaxHelpTextLines, cppu::UnoType<decltype(m_nMaxHelpTextLines)>::get() ); registerProperty( - OUString( "IsReadOnly" ), + "IsReadOnly", MODEL_PROPERTY_ID_IS_READ_ONLY, PropertyAttribute::BOUND, &m_bIsReadOnly, cppu::UnoType<decltype(m_bIsReadOnly)>::get() diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index ed0dd6d049ce..df3fdde7a19f 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -312,7 +312,7 @@ namespace pcr :ONumericControl( pParent, nWinStyle ) { getTypedControlWindow()->SetUnit( FUNIT_CUSTOM ); - getTypedControlWindow()->SetCustomUnitText(OUString(" ms")); + getTypedControlWindow()->SetCustomUnitText(" ms"); getTypedControlWindow()->SetCustomConvertHdl( LINK( this, OTimeDurationControl, OnCustomConvert ) ); } diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 9b1ebb0d4e7d..85f7b08a53cb 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -478,7 +478,7 @@ void SaneDlg::InitFields() else // SANE_UNIT_PIXEL { pField->SetValue( (int)fValue, FUNIT_CUSTOM ); - pField->SetCustomUnitText(OUString("Pixel")); + pField->SetCustomUnitText("Pixel"); } switch( i ) { case 0: aTopLeft.X() = (int)fValue;break; |