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 /svtools/source/control | |
| 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 'svtools/source/control')
| -rw-r--r-- | svtools/source/control/inettbc.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/control/roadmap.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/control/toolbarmenuacc.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/control/valueacc.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index ceed216572fd..983e4ca311f0 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -374,8 +374,8 @@ void SvtMatchContext_Impl::ReadFolder( const String& rURL, uno::Reference< XResultSet > xResultSet; Sequence< OUString > aProps(2); OUString* pProps = aProps.getArray(); - pProps[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ); - pProps[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ); + pProps[0] = OUString( "Title" ); + pProps[1] = OUString( "IsFolder" ); try { diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 7d7e2b440e0e..93e57f345946 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -762,7 +762,7 @@ namespace svt if ( mpID ) { - ::rtl::OUString aIDText = ::rtl::OUString::valueOf( (sal_Int32)( _nIndex + 1 ) ) + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." )); + ::rtl::OUString aIDText = ::rtl::OUString::valueOf( (sal_Int32)( _nIndex + 1 ) ) + ::rtl::OUString( "." ); mpID->SetText( aIDText ); } @@ -838,7 +838,7 @@ namespace svt { // calculate widths long nIDWidth = mpID->GetTextWidth( mpID->GetText() ); - long nMaxIDWidth = mpID->GetTextWidth( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "100." )) ); + long nMaxIDWidth = mpID->GetTextWidth( ::rtl::OUString( "100." ) ); nIDWidth = ::std::min( nIDWidth, nMaxIDWidth ); // check how many space the description would need diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 3d0642b680bc..56537b97cee4 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -226,7 +226,7 @@ sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole() throw (RuntimeException) OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription() throw (RuntimeException) { ThrowIfDisposed(); - return OUString( RTL_CONSTASCII_USTRINGPARAM( "ToolbarMenu" ) ); + return OUString( "ToolbarMenu" ); } // ----------------------------------------------------------------------------- @@ -599,7 +599,7 @@ void ToolbarMenuAcc::ThrowIfDisposed (void) throw (DisposedException) { if(rBHelper.bDisposed || rBHelper.bInDispose || !mpParent) { - throw DisposedException ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("object has been already disposed")), static_cast<XWeak*>(this)); + throw DisposedException ( ::rtl::OUString("object has been already disposed"), static_cast<XWeak*>(this)); } } diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index bb9623dc733e..0df398ece368 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -747,7 +747,7 @@ void ValueSetAcc::ThrowIfDisposed (void) { OSL_TRACE ("Calling disposed object. Throwing exception:"); throw lang::DisposedException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("object has been already disposed")), + ::rtl::OUString("object has been already disposed"), static_cast<uno::XWeak*>(this)); } else |