diff options
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 4 | ||||
| -rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 4 | ||||
| -rw-r--r-- | cui/source/dialogs/hlmarkwn.cxx | 4 | ||||
| -rw-r--r-- | cui/source/options/cfgchart.cxx | 4 | ||||
| -rw-r--r-- | cui/source/options/optsave.cxx | 7 | ||||
| -rw-r--r-- | cui/source/options/webconninfo.cxx | 2 |
6 files changed, 12 insertions, 13 deletions
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index e66403c664a5..bbe06d6aa432 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1510,7 +1510,7 @@ private: OUString SAL_CALL ColorPicker_getImplementationName() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.cui.ColorPicker" ) ); + return OUString( "com.sun.star.cui.ColorPicker" ); } // -------------------------------------------------------------------- @@ -1525,7 +1525,7 @@ Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XCompone Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > seq(1); - seq[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.ColorPicker" ) ); + seq[0] = OUString( "com.sun.star.ui.dialogs.ColorPicker" ); return seq; } diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 31af615160fa..d5c0fed2139e 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -133,8 +133,8 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext() ); Sequence< OUString > aProps( 2 ); - aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "IsFolder" )); - aProps.getArray()[ 1 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "IsDocument" )); + aProps.getArray()[ 0 ] = OUString( "IsFolder" ); + aProps.getArray()[ 1 ] = OUString( "IsDocument" ); ::com::sun::star::uno::Reference< XResultSet > xResultSet( aCnt.createCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ) ); diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index fe8408130bd1..15066802f930 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -255,9 +255,9 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL ) try { uno::Sequence< beans::PropertyValue > aArg(1); - aArg.getArray()[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "Hidden" )); + aArg.getArray()[0].Name = OUString( "Hidden" ); aArg.getArray()[0].Value <<= (sal_Bool) sal_True; - xComp = xLoader->loadComponentFromURL( aURL, OUString(RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0, aArg ); + xComp = xLoader->loadComponentFromURL( aURL, OUString( "_blank" ), 0, aArg ); } catch( const io::IOException& ) { diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 0f79ebfbdd40..a9dcd4aad45e 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -173,11 +173,11 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const // ==================== SvxChartOptions::SvxChartOptions() : - ::utl::ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Chart") ) ), + ::utl::ConfigItem( rtl::OUString("Office.Chart") ), mbIsInitialized( sal_False ) { maPropertyNames.realloc( 1 ); - maPropertyNames[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultColor/Series") ); + maPropertyNames[ 0 ] = ::rtl::OUString("DefaultColor/Series"); } SvxChartOptions::~SvxChartOptions() diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index efced8d6b6ba..cc1a243a1b82 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -468,10 +468,10 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) while(xList->hasMoreElements()) { SequenceAsHashMap aFilter(xList->nextElement()); - OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),OUString()); + OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString("Name"),OUString()); if (!sFilter.isEmpty()) { - sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),sal_Int32()); + sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString("Flags"),sal_Int32()); lList.push_back(sFilter); lAlienList.push_back(0 != (nFlags & SFX_FILTER_ALIEN)); lODFList.push_back( isODFFormat( sFilter ) ); @@ -491,8 +491,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) OSL_FAIL( rtl::OUStringToOString( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "exception in FilterFactory access: ")) + + "exception in FilterFactory access: ") + e.Message), RTL_TEXTENCODING_UTF8). getStr()); diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index d56ebb8d94b8..49a0354bdf86 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -190,7 +190,7 @@ void WebConnectionInfoDialog::FillPasswordList() { ::rtl::OUString aUIEntry( aUrls[ nURLIdx ] ); aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' ); - aUIEntry += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*" ) ); + aUIEntry += ::rtl::OUString( "*" ); SvTreeListEntry* pEntry = m_pPasswordsLB->InsertEntry( aUIEntry ); pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) ); } |