diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:22:44 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:00:26 +0000 |
| commit | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch) | |
| tree | 2dbddceebf0f96492adc5652697e8efce8a8ba06 /sd | |
| parent | fe8eba5faa59ddf9ee82f3eb009daac72a0ec846 (diff) | |
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex:
s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms
Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/regression-test.cxx | 5 | ||||
| -rw-r--r-- | sd/source/core/sdpage2.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/ImagePreparer.cxx | 2 | ||||
| -rw-r--r-- | sd/workben/custompanel/ctp_panel.cxx | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/sd/qa/unit/regression-test.cxx b/sd/qa/unit/regression-test.cxx index e378ff073319..a19a0566a008 100644 --- a/sd/qa/unit/regression-test.cxx +++ b/sd/qa/unit/regression-test.cxx @@ -134,7 +134,7 @@ FileFormat aFileFormats[] = { rtl::OUString(), pFmt->nFormatType, nFormat, rtl::OUString::createFromAscii( pFmt->pTypeName ), 0, rtl::OUString(), rtl::OUString(), /* userdata */ - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/simpress*")) ); + rtl::OUString("private:factory/simpress*") ); aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(); @@ -277,8 +277,7 @@ void SdFiltersTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xDrawComponent = - getMultiServiceFactory()->createInstance(rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresentationDocument"))); + getMultiServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.Draw.PresentationDocument")); CPPUNIT_ASSERT_MESSAGE("no impress component!", m_xDrawComponent.is()); } diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index d620edb3dce6..c446f05876e1 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -633,7 +633,7 @@ void SdPage::removeAnnotation( const Reference< XAnnotation >& xAnnotation ) { pModel->SetChanged(); Reference< XInterface > xSource( xAnnotation, UNO_QUERY ); - NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnAnnotationRemoved" ) ), xSource ); + NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), rtl::OUString( "OnAnnotationRemoved" ), xSource ); } } diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx index 375ade4e7397..bdaddea1b098 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.cxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx @@ -392,7 +392,7 @@ sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl if ( !bHasBaseURL ) { aArgs.realloc ( ++nEnd ); - aArgs[nEnd-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "DocumentBaseURL" ) ); + aArgs[nEnd-1].Name = ::rtl::OUString( "DocumentBaseURL" ); aArgs[nEnd-1].Value <<= rMedium.GetBaseURL( sal_True ); } diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx index bfe6b18b5db0..3e2f947a20f4 100644 --- a/sd/workben/custompanel/ctp_panel.cxx +++ b/sd/workben/custompanel/ctp_panel.cxx @@ -87,7 +87,7 @@ namespace sd { namespace colortoolpanel WindowDescriptor aWindow; aWindow.Type = WindowClass_SIMPLE; - aWindow.WindowServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "window" ) ); + aWindow.WindowServiceName = ::rtl::OUString( "window" ); aWindow.Parent = i_rParentWindow; aWindow.WindowAttributes = WindowAttribute::BORDER; |