diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-05-06 16:32:22 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-05-06 16:51:45 +0200 |
| commit | e2e2cc61144cb22227eebfadff0ea24b51ccfbd0 (patch) | |
| tree | 8063275cabcdf32e30c37451a32d96db5929561a | |
| parent | d01768c31a0658c8a74e0dd3a95b2d781639d18e (diff) | |
remove usage of RTL_CONSTASCII_USTRINGPARAM
Mechanical removal of usage together with OUString ctor, done
by compiler plugin.
Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5
218 files changed, 954 insertions, 1061 deletions
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index f362bff17be2..c80fb1f46295 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1030,9 +1030,9 @@ try { OSL_UNUSED( e ); #ifdef DBG_UTIL - OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("TransferFormComponentProperties : could not transfer the value for property \"")); + OUString sMessage("TransferFormComponentProperties : could not transfer the value for property \""); sMessage += pResult->Name; - sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM("\"")); + sMessage += OUString("\""); OSL_FAIL(OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US).getStr()); #endif } diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index df243d3b169c..23b4f53b2036 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -241,7 +241,7 @@ namespace } if ( nColCount ) - sSql = sSql.replaceAt(sSql.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + sSql = sSql.replaceAt(sSql.getLength()-1,1,OUString(")")); return sSql; } } @@ -364,9 +364,9 @@ OUString createSqlCreateTableStatement( const Reference< XPropertySet >& descri else { if ( aSql.lastIndexOf(',') == (aSql.getLength()-1) ) - aSql = aSql.replaceAt(aSql.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + aSql = aSql.replaceAt(aSql.getLength()-1,1,OUString(")")); else - aSql += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + aSql += OUString(")"); } return aSql; } diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx index c274d51f5835..f72cbb763d8a 100644 --- a/connectivity/source/drivers/jdbc/InputStream.cxx +++ b/connectivity/source/drivers/jdbc/InputStream.cxx @@ -72,7 +72,7 @@ void SAL_CALL java_io_InputStream::closeInput( ) throw(::com::sun::star::io::No sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { if (nBytesToRead < 0) - throw ::com::sun::star::io::BufferSizeExceededException( OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), *this ); + throw ::com::sun::star::io::BufferSizeExceededException( OUString( OSL_LOG_PREFIX ), *this ); jint out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index cbac0a065ca2..fa30285f9d7c 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -290,7 +290,7 @@ OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, Runt OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { // normally this is " - return OUString( RTL_CONSTASCII_USTRINGPARAM("\"")); + return OUString( "\""); } // ------------------------------------------------------------------------- OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 04aeb2225d96..6ccaf5cd32ea 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -258,7 +258,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql else if(!bAdjusted) //Our sql parser does not support a statement like "create table foo" // So we append ("E-mail" varchar) to the last of it to make it work { - return parseSql(sql + OUString( RTL_CONSTASCII_USTRINGPARAM("(""E-mail"" caracter)")),sal_True); + return parseSql(sql + OUString( "(""E-mail"" caracter)"),sal_True); } getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this ); diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx index f0dc4d6b67eb..85076b00157b 100644 --- a/cppu/source/threadpool/thread.cxx +++ b/cppu/source/threadpool/thread.cxx @@ -55,9 +55,8 @@ namespace cppu_threadpool { { throw css::lang::DisposedException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "cppu_threadpool::ORequestThread created after" - " cppu_threadpool::ThreadAdmin has been disposed")), + " cppu_threadpool::ThreadAdmin has been disposed"), css::uno::Reference< css::uno::XInterface >()); } m_lst.push_back( p ); diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx index 5e53ea8d476c..bc954c67ba73 100644 --- a/cppu/source/uno/cascade_mapping.cxx +++ b/cppu/source/uno/cascade_mapping.cxx @@ -224,7 +224,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, if (pAddPurpose && pAddPurpose->length) return; - rtl::OUString uno_envType(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)); + rtl::OUString uno_envType(UNO_LB_UNO); rtl::OUString from_envType = cppu::EnvDcp::getTypeName(pFrom->pTypeName); rtl::OUString to_envType = cppu::EnvDcp::getTypeName(pTo->pTypeName); diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 23373182b84e..27a1027c9a6a 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -1075,7 +1075,7 @@ static bool loadEnv(OUString const & cLibStem, if (!hMod) return false; - OUString aSymbolName(RTL_CONSTASCII_USTRINGPARAM(UNO_INIT_ENVIRONMENT)); + OUString aSymbolName(UNO_INIT_ENVIRONMENT); uno_initEnvironmentFunc fpInit = (uno_initEnvironmentFunc) ::osl_getFunctionSymbol( hMod, aSymbolName.pData ); diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index f699cee57964..65d47760d6ee 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -430,7 +430,7 @@ static Mapping loadExternalMapping( if (hModule) { - OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM(UNO_EXT_GETMAPPING) ); + OUString aSymbolName( UNO_EXT_GETMAPPING ); uno_ext_getMappingFunc fpGetMapFunc = (uno_ext_getMappingFunc)::osl_getFunctionSymbol( hModule, aSymbolName.pData ); @@ -507,7 +507,7 @@ static Mapping getMediateMapping( // backwards: from dest to source of mapping chain // connect to uno - OUString aUnoEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ); + OUString aUnoEnvTypeName( UNO_LB_UNO ); if (rTo.getTypeName() == aUnoEnvTypeName) // to is uno { aUno = rTo; diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index b95d50e1f304..7d417788238f 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -860,7 +860,7 @@ Reference< XComponentContext > SAL_CALL createComponentContext( SAL_THROW(()) { uno::Environment curr_env(Environment::getCurrent()); - uno::Environment source_env(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV)))); + uno::Environment source_env(rtl::OUString(CPPU_STRINGIFY(CPPU_ENV))); uno::Mapping curr2source(curr_env, source_env); uno::Mapping source2curr(source_env, curr_env); diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index 3553d182b70c..72ff90a4114e 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -197,7 +197,7 @@ Reference< lang::XSingleComponentFactory > create_bootstrap_macro_expander_facto s_get_service_names() )); uno::Environment curr_env(Environment::getCurrent()); - uno::Environment target_env(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV)))); + uno::Environment target_env(rtl::OUString(CPPU_STRINGIFY(CPPU_ENV))); uno::Mapping target2curr(target_env, curr_env); diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx index 12a3752a44e4..f1d7c5261046 100644 --- a/cppuhelper/source/propertysetmixin.cxx +++ b/cppuhelper/source/propertysetmixin.cxx @@ -485,18 +485,16 @@ PropertySetMixinImpl::Impl::Impl( css::uno::Reference< css::container::XHierarchicalNameAccess >( m_context->getValueByName( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.reflection." - "theTypeDescriptionManager"))), + "theTypeDescriptionManager")), css::uno::UNO_QUERY_THROW)->getByHierarchicalName( m_type.getTypeName()), css::uno::UNO_QUERY_THROW); } catch (css::container::NoSuchElementException & e) { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "unexpected" - " com.sun.star.container.NoSuchElementException: ")) + " com.sun.star.container.NoSuchElementException: ") + e.Message), css::uno::Reference< css::uno::XInterface >()); } @@ -541,9 +539,8 @@ void PropertySetMixinImpl::Impl::setProperty( { throw css::lang::IllegalArgumentException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "flagging as ambiguous/defaulted non-ambiguous/defaulted" - " property ")) + " property ") + name), object, illegalArgumentPosition); } @@ -576,9 +573,8 @@ void PropertySetMixinImpl::Impl::setProperty( } else { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "unexpected" - " com.sun.star.lang.IllegalArgumentException: ")) + " com.sun.star.lang.IllegalArgumentException: ") + e.Message), object); } @@ -690,10 +686,9 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty( { throw css::uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "unexpected type of" " com.sun.star.beans.Ambiguous IsAmbiguous" - " member")), + " member"), object); } value = css::uno::Reference< css::reflection::XIdlField2 >( @@ -703,9 +698,8 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty( } catch (css::lang::IllegalArgumentException & e) { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "unexpected com.sun.star.lang." - "IllegalArgumentException: ")) + "IllegalArgumentException: ") + e.Message), object); } @@ -727,10 +721,9 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty( { throw css::uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "unexpected type of" " com.sun.star.beans.Defaulted IsDefaulted" - " member")), + " member"), object); } value = css::uno::Reference< css::reflection::XIdlField2 >( @@ -740,9 +733,8 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty( } catch (css::lang::IllegalArgumentException & e) { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "unexpected com.sun.star.lang." - "IllegalArgumentException: ")) + "IllegalArgumentException: ") + e.Message), object); } @@ -764,9 +756,8 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty( { throw css::uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "unexpected type of com.sun.star.beans.Optional" - " IsPresent member")), + " IsPresent member"), object); } if (!present) { @@ -780,9 +771,8 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty( } catch (css::lang::IllegalArgumentException & e) { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "unexpected com.sun.star.lang." - "IllegalArgumentException: ")) + "IllegalArgumentException: ") + e.Message), object); } @@ -825,9 +815,8 @@ PropertySetMixinImpl::Impl::getReflection(rtl::OUString const & typeName) const } catch (css::uno::Exception & e) { throw css::uno::DeploymentException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "component context fails to supply service" - " com.sun.star.reflection.CoreReflection: ")) + " com.sun.star.reflection.CoreReflection: ") + e.Message), m_context); } @@ -870,17 +859,15 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue( } catch (css::lang::IllegalArgumentException & e) { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "unexpected" - " com.sun.star.lang.IllegalArgumentException: ")) + " com.sun.star.lang.IllegalArgumentException: ") + e.Message), object); } catch (css::lang::IllegalAccessException & e) { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "unexpected" - " com.sun.star.lang.IllegalAccessException: ")) + " com.sun.star.lang.IllegalAccessException: ") + e.Message), object); } @@ -909,17 +896,15 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue( } catch (css::lang::IllegalArgumentException & e) { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "unexpected" - " com.sun.star.lang.IllegalArgumentException: ")) + " com.sun.star.lang.IllegalArgumentException: ") + e.Message), object); } catch (css::lang::IllegalAccessException & e) { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "unexpected" - " com.sun.star.lang.IllegalAccessException: ")) + " com.sun.star.lang.IllegalAccessException: ") + e.Message), object); } @@ -951,17 +936,15 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue( } catch (css::lang::IllegalArgumentException & e) { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "unexpected" - " com.sun.star.lang.IllegalArgumentException: ")) + " com.sun.star.lang.IllegalArgumentException: ") + e.Message), object); } catch (css::lang::IllegalAccessException & e) { throw css::uno::RuntimeException( (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "unexpected" - " com.sun.star.lang.IllegalAccessException: ")) + " com.sun.star.lang.IllegalAccessException: ") + e.Message), object); } diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index e230c1514689..f838adfdd8c7 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -748,7 +748,7 @@ sal_Bool SAL_CALL installTypeDescriptionManager( SAL_THROW(()) { uno::Environment curr_env(Environment::getCurrent()); - uno::Environment target_env(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV)))); + uno::Environment target_env(rtl::OUString(CPPU_STRINGIFY(CPPU_ENV))); uno::Mapping curr2target(curr_env, target_env); diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx index 7179256f3a3a..3e7f5578cef5 100644 --- a/cppuhelper/source/unourl.cxx +++ b/cppuhelper/source/unourl.cxx @@ -216,8 +216,8 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl) { if (!rUrl.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("uno:"), 0)) throw rtl::MalformedUriException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "UNO URL does not start with \"uno:\""))); + rtl::OUString( + "UNO URL does not start with \"uno:\"")); sal_Int32 i = RTL_CONSTASCII_LENGTH("uno:"); sal_Int32 j = rUrl.indexOf(';', i); if (j < 0) diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index 7343aaec5660..1a6d9a7fff80 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -535,9 +535,9 @@ SAL_IMPLEMENT_MAIN() if (! aUnoUrl.endsWithIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM(";uno.ComponentContext") )) throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM( + OUString( "expected UNO-URL with instance name " - "uno.ComponentContext!") ), + "uno.ComponentContext!" ), Reference<XInterface>() ); if (bSingleInstance) throw RuntimeException( @@ -621,7 +621,7 @@ SAL_IMPLEMENT_MAIN() { Reference< XComponent > xComp( xBridge, UNO_QUERY ); if (! xComp.is()) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("bridge factory does not export interface \"com.sun.star.lang.XComponent\"!" ) ), Reference< XInterface >() ); + throw RuntimeException( OUString( "bridge factory does not export interface \"com.sun.star.lang.XComponent\"!" ), Reference< XInterface >() ); ODisposingListener::waitFor( xComp ); xComp->dispose(); // explicitly dispose the remote bridge so that it joins @@ -650,7 +650,7 @@ SAL_IMPLEMENT_MAIN() Reference< XComponent > xComp( xInstance, UNO_QUERY ); if (xComp.is()) xComp->dispose(); - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("component does not export interface interface \"com.sun.star.lang.XMain\"!" ) ), Reference< XInterface >() ); + throw RuntimeException( OUString( "component does not export interface interface \"com.sun.star.lang.XMain\"!" ), Reference< XInterface >() ); } } } diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index c0f0831c1bc8..46d3053db8f7 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1533,8 +1533,8 @@ Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( Runt ColorPicker::ColorPicker( Reference< XComponentContext > const & xContext ) : ColorPickerBase( m_aMutex ) , mxContext( xContext ) -, msColorKey( RTL_CONSTASCII_USTRINGPARAM( "Color" ) ) -, msModeKey( RTL_CONSTASCII_USTRINGPARAM( "Mode" ) ) +, msColorKey( "Color" ) +, msModeKey( "Mode" ) , mnColor( 0 ) , mnMode( 0 ) { diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index ce6581001dce..f333f10ac687 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -824,9 +824,9 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet& OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText, const OUString& _rExtension ) { - OUString sAllFilter( RTL_CONSTASCII_USTRINGPARAM( "(*.*)" ) ); + OUString sAllFilter( "(*.*)" ); OUString sOpenBracket( " (" ); - OUString sCloseBracket( RTL_CONSTASCII_USTRINGPARAM( ")" ) ); + OUString sCloseBracket( ")" ); OUString sRet = _rDisplayText; if ( sRet.indexOf( sAllFilter ) == -1 ) diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index e1ab16c88171..86e6f48017e2 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -634,7 +634,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet) aAutoStr += m_pIconStyleLB->GetEntry( aIconStyleItemId[nAutoStyle] ); m_pIconStyleLB->RemoveEntry( 0 ); - m_pIconStyleLB->InsertEntry( aAutoStr += OUString(RTL_CONSTASCII_USTRINGPARAM(")") ), 0 ); + m_pIconStyleLB->InsertEntry( aAutoStr += OUString(")" ), 0 ); // separate auto and other icon themes m_pIconStyleLB->SetSeparatorPos( 0 ); } diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 5c8ea9edc3af..fb0558e79d18 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -882,8 +882,8 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R } } - aSql = aSql.replaceAt(aSql.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); - aValues = aValues.replaceAt(aValues.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + aSql = aSql.replaceAt(aSql.getLength()-1,1,OUString(")")); + aValues = aValues.replaceAt(aValues.getLength()-1,1,OUString(")")); aSql += aValues; // now create,fill and execute the prepared statement diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index d8007acb9b3b..a07b18e45ebc 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2932,7 +2932,7 @@ OUString OQueryDesignView::getStatement() { OUString aTmp("( "); aTmp += aJoinCrit; - aTmp += OUString(RTL_CONSTASCII_USTRINGPARAM(" )")); + aTmp += OUString(" )"); if(aCriteriaListStr.getLength()) { aTmp += C_AND; diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx index 096a942512b4..a8e68ae48d9f 100644 --- a/dtrans/source/cnttype/mctfentry.cxx +++ b/dtrans/source/cnttype/mctfentry.cxx @@ -77,7 +77,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL mcnttype_component_getFactory( const sal_Cha if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, MIMECONTENTTYPEFACTORY_IMPL_NAME ) ) ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( MIMECONTENTTYPEFACTORY_SERVICE_NAME ) ); + aSNS.getArray( )[0] = OUString( MIMECONTENTTYPEFACTORY_SERVICE_NAME ); Reference< XSingleServiceFactory > xFactory ( createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index cce9583619e2..0aeb0db850fe 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -185,25 +185,25 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa Any aVal; { aVal <<= rFmt.GetNumberingType(); - beans::PropertyValue aAlignProp( OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_NUMBERINGTYPE)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + beans::PropertyValue aAlignProp( OUString(UNO_NAME_NRULE_NUMBERINGTYPE), -1, aVal, beans::PropertyState_DIRECT_VALUE); pArray[nIdx++] = aAlignProp; } { SvxAdjust eAdj = rFmt.GetNumAdjust(); aVal <<= ConvertUnoAdjust(eAdj); - pArray[nIdx++] = beans::PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_ADJUST)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue( OUString(UNO_NAME_NRULE_ADJUST), -1, aVal, beans::PropertyState_DIRECT_VALUE); } { aVal <<= OUString(rFmt.GetPrefix()); - beans::PropertyValue aPrefixProp( OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_PREFIX)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + beans::PropertyValue aPrefixProp( OUString(UNO_NAME_NRULE_PREFIX), -1, aVal, beans::PropertyState_DIRECT_VALUE); pArray[nIdx++] = aPrefixProp; } { aVal <<= OUString(rFmt.GetSuffix()); - beans::PropertyValue aSuffixProp( OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_SUFFIX)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + beans::PropertyValue aSuffixProp( OUString(UNO_NAME_NRULE_SUFFIX), -1, aVal, beans::PropertyState_DIRECT_VALUE); pArray[nIdx++] = aSuffixProp; } @@ -220,7 +220,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa awt::FontDescriptor aDesc; SvxUnoFontDescriptor::ConvertFromFont( *rFmt.GetBulletFont(), aDesc ); aVal.setValue(&aDesc, ::getCppuType((const awt::FontDescriptor*)0)); - pArray[nIdx++] = beans::PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_BULLET_FONT)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue( OUString(UNO_NAME_NRULE_BULLET_FONT), -1, aVal, beans::PropertyState_DIRECT_VALUE); } { @@ -228,7 +228,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa if(pBrush && pBrush->GetGraphicObject()) { const GraphicObject* pGrafObj = pBrush->GetGraphicObject(); - OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); + OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX); aURL += OStringToOUString(pGrafObj->GetUniqueID(), RTL_TEXTENCODING_ASCII_US); @@ -247,21 +247,21 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa } aVal <<= (sal_Int16)rFmt.GetStart(); - pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_START_WITH)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue(OUString(UNO_NAME_NRULE_START_WITH), -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal <<= (sal_Int32)rFmt.GetAbsLSpace(); - pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_LEFT_MARGIN)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue(OUString(UNO_NAME_NRULE_LEFT_MARGIN), -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal <<= (sal_Int32)rFmt.GetFirstLineOffset(); - pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_FIRST_LINE_OFFSET)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue(OUString(UNO_NAME_NRULE_FIRST_LINE_OFFSET), -1, aVal, beans::PropertyState_DIRECT_VALUE); pArray[nIdx++] = beans::PropertyValue(OUString("SymbolTextDistance"), -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal <<= (sal_Int32)rFmt.GetBulletColor().GetColor(); - pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_BULLET_COLOR)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue(OUString(UNO_NAME_NRULE_BULLET_COLOR), -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal <<= (sal_Int16)rFmt.GetBulletRelSize(); - pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_BULLET_RELSIZE)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[nIdx++] = beans::PropertyValue(OUString(UNO_NAME_NRULE_BULLET_RELSIZE), -1, aVal, beans::PropertyState_DIRECT_VALUE); DBG_ASSERT( nIdx <= nProps, "FixMe: overflow in Array!!! [CL]" ); Sequence< beans::PropertyValue> aSeq(pArray, nIdx); diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index 8e9cb800f4b0..cc99b3b8beae 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -957,7 +957,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( } else throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1146,7 +1146,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed:: if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // for now support of this interface is required to allow breaking of links and converting them to normal embedded @@ -1274,7 +1274,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed:: if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // for now support of this interface is required to allow breaking of links and converting them to normal embedded @@ -1482,7 +1482,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_xObjectStorage.is() ) @@ -1509,7 +1509,7 @@ OUString SAL_CALL OCommonEmbeddedObject::getEntryName() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aEntryName; @@ -1541,7 +1541,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_bReadOnly ) @@ -1621,7 +1621,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isReadonly() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_bReadOnly; @@ -1661,7 +1661,7 @@ void SAL_CALL OCommonEmbeddedObject::reload( if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_bIsLink ) @@ -1798,7 +1798,7 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); uno::Reference< container::XNameAccess > xNameAccess( xStorage, uno::UNO_QUERY ); diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx index a3826de0963c..38c89fd704c3 100644 --- a/embeddedobj/source/commonembedding/visobj.cxx +++ b/embeddedobj/source/commonembedding/visobj.cxx @@ -205,7 +205,7 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe throw uno::RuntimeException(); datatransfer::DataFlavor aDataFlavor( - OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )), + OUString( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ), OUString( "GDIMetaFile" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx index 12fb3189300c..94679bb145e0 100644 --- a/embeddedobj/source/general/dummyobject.cxx +++ b/embeddedobj/source/general/dummyobject.cxx @@ -333,7 +333,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry( saveCompleted( ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) ) ); else throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -375,7 +375,7 @@ void SAL_CALL ODummyEmbeddedObject::storeToEntry( const uno::Reference< embed::X if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); m_xParentStorage->copyElementTo( m_aEntryName, xStorage, sEntName ); @@ -397,7 +397,7 @@ void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::X if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); PostEvent_Impl( OUString( "OnSaveAs" ) ); @@ -453,7 +453,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( !m_aEntryName.isEmpty() ) @@ -472,7 +472,7 @@ OUString SAL_CALL ODummyEmbeddedObject::getEntryName() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aEntryName; @@ -490,7 +490,7 @@ void SAL_CALL ODummyEmbeddedObject::storeOwn() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // the object can not be activated or changed @@ -507,7 +507,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::isReadonly() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // this object can not be changed @@ -529,7 +529,7 @@ void SAL_CALL ODummyEmbeddedObject::reload( if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // nothing to reload diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index 7848b8e549c8..1f160564fd7c 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -197,7 +197,7 @@ Interceptor::addStatusListener( aStateEvent.FeatureDescriptor = OUString("Update"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; - aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($1) ")) + m_pDocHolder->GetTitle() ); + aStateEvent.State <<= (OUString( "($1) ") + m_pDocHolder->GetTitle() ); Control->statusChanged(aStateEvent); { @@ -221,7 +221,7 @@ Interceptor::addStatusListener( aStateEvent.FeatureDescriptor = OUString("Close and Return"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; - aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($2) ")) + m_pDocHolder->GetTitle() ); + aStateEvent.State <<= (OUString( "($2) ") + m_pDocHolder->GetTitle() ); Control->statusChanged(aStateEvent); @@ -243,7 +243,7 @@ Interceptor::addStatusListener( aStateEvent.FeatureDescriptor = OUString("SaveCopyTo"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; - aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); + aStateEvent.State <<= (OUString( "($3)")); Control->statusChanged(aStateEvent); { diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index cd8324972960..7b683ceb198b 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -1088,7 +1088,7 @@ void OleEmbeddedObject::StoreToLocation_Impl( if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( m_xParentStorage.is() && m_xObjectStream.is(), "The object has no valid persistence!\n" ); @@ -1347,7 +1347,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( saveCompleted( ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) ) ); else throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1679,7 +1679,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_xObjectStream.is() ) @@ -1715,7 +1715,7 @@ OUString SAL_CALL OleEmbeddedObject::getEntryName() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aEntryName; @@ -1760,7 +1760,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_bReadOnly ) @@ -1869,7 +1869,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::isReadonly() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_bReadOnly; @@ -1910,7 +1910,7 @@ void SAL_CALL OleEmbeddedObject::reload( if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // TODO: @@ -1966,7 +1966,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); @@ -2081,7 +2081,7 @@ OUString SAL_CALL OleEmbeddedObject::getLinkURL() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString( "The object waits for saveCompleted() call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( !m_bIsLink ) diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index c09634f666fb..d09d2aad93ca 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -54,7 +54,7 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo { // it's a bitmap aVisualRepr.Flavor = datatransfer::DataFlavor( - OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )), + OUString( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ), OUString( "Bitmap" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); } @@ -62,7 +62,7 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo { // it's a metafile aVisualRepr.Flavor = datatransfer::DataFlavor( - OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), + OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ), OUString( "Windows Metafile" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); } diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index b22a7d12ab33..f4cfa2b7bb6c 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -1316,7 +1316,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const OUString& Reference< XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo(); if (xPropInfo->hasPropertyByName(uProp)) { - OUString sId(RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME )); + OUString sId( INET_HID_SCHEME ); sId += OUString::createFromAscii( HID_BIB_DB_GRIDCTRL ); xPropSet->setPropertyValue( uProp, makeAny( sId ) ); } diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx index 7bf518813c33..16d28106f661 100644 --- a/extensions/source/logging/csvformatter.cxx +++ b/extensions/source/logging/csvformatter.cxx @@ -105,13 +105,13 @@ namespace logging //= private helpers namespace { - const sal_Unicode quote_char = OUString(RTL_CONSTASCII_USTRINGPARAM("\"")).toChar(); + const sal_Unicode quote_char = OUString("\"").toChar(); const sal_Unicode comma_char = OUString(",").toChar(); const OUString dos_newline = OUString("\r\n"); inline bool needsQuoting(const OUString& str) { - static const OUString quote_trigger_chars = OUString( RTL_CONSTASCII_USTRINGPARAM("\",\n\r")); + static const OUString quote_trigger_chars = OUString( "\",\n\r"); sal_Int32 len = str.getLength(); for(sal_Int32 i=0; i<len; i++) if(quote_trigger_chars.indexOf(str[i])!=-1) diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 8354791b97b2..ae2f36f3354e 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7368,7 +7368,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) eFS = com::sun::star::drawing::FillStyle_BITMAP; const XFillBitmapItem aXFillBitmapItem((const XFillBitmapItem&)pObj->GetMergedItem( XATTR_FILLBITMAP )); - OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); + OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX); aURL += OStringToOUString( aXFillBitmapItem.GetGraphicObject().GetUniqueID(), RTL_TEXTENCODING_ASCII_US); diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index 52c48c23e95e..20f7f86a6926 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -164,7 +164,7 @@ Sequence< OUString > SAL_CALL PlaceWareExportFilter_getSupportedServiceNames( ) { Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + pArray[0] = OUString ( SERVICE_NAME ); return aRet; } #undef SERVICE_NAME diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx index 01e3648926f7..fc9c2c73d16b 100644 --- a/filter/source/svg/impsvgdialog.cxx +++ b/filter/source/svg/impsvgdialog.cxx @@ -66,9 +66,9 @@ ImpSVGDialog::ImpSVGDialog( Window* pParent/*, ResMgr& rResMgr*/, Sequence< Prop maCBUseNativeDecoration.SetPosSizePixel( Point( implMap( *this, 12 ), implMap( *this, 41 ) ), Size( implMap( *this, 142 ), implMap( *this, 10 ) ) ); - maCBTinyProfile.Check( maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_TINYPROFILE ) ), sal_False ) ); - maCBEmbedFonts.Check( maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_EMBEDFONTS ) ), sal_True ) ); - maCBUseNativeDecoration.Check( maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_NATIVEDECORATION ) ), sal_True ) ); + maCBTinyProfile.Check( maConfigItem.ReadBool( OUString( SVG_PROP_TINYPROFILE ), sal_False ) ); + maCBEmbedFonts.Check( maConfigItem.ReadBool( OUString( SVG_PROP_EMBEDFONTS ), sal_True ) ); + maCBUseNativeDecoration.Check( maConfigItem.ReadBool( OUString( SVG_PROP_NATIVEDECORATION ), sal_True ) ); maBTOK.SetPosSizePixel( Point( implMap( *this, 12 ), implMap( *this, 57 ) ), Size( implMap( *this, 50 ), implMap( *this, 14 ) ) ); @@ -101,9 +101,9 @@ ImpSVGDialog::~ImpSVGDialog() Sequence< PropertyValue > ImpSVGDialog::GetFilterData() { - maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_TINYPROFILE ) ), maCBTinyProfile.IsChecked() ); - maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_EMBEDFONTS ) ), maCBEmbedFonts.IsChecked() ); - maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_NATIVEDECORATION ) ), maCBUseNativeDecoration.IsChecked() ); + maConfigItem.WriteBool( OUString( SVG_PROP_TINYPROFILE ), maCBTinyProfile.IsChecked() ); + maConfigItem.WriteBool( OUString( SVG_PROP_EMBEDFONTS ), maCBEmbedFonts.IsChecked() ); + maConfigItem.WriteBool( OUString( SVG_PROP_NATIVEDECORATION ), maCBUseNativeDecoration.IsChecked() ); return( maConfigItem.GetFilterData() ); } diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index b400c153b8fe..54563856b143 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star::document; OUString SVGDialog_getImplementationName () throw (RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( SVG_DIALOG_IMPLEMENTATION_NAME ) ); + return OUString ( SVG_DIALOG_IMPLEMENTATION_NAME ); } // ----------------------------------------------------------------------------- @@ -69,7 +69,7 @@ Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames() { Sequence< OUString > aRet( 1 ); - aRet.getArray()[ 0 ] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SVG_DIALOG_SERVICE_NAME ) ); + aRet.getArray()[ 0 ] = OUString ( SVG_DIALOG_SERVICE_NAME ); return aRet; } diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index a11fcffadc17..c0b017cfc489 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -162,7 +162,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star { Reference< XConfigManager >xCfgMgr ( mxMSF->createInstance( OUString( "com.sun.star.config.SpecialConfigManager" ) ), UNO_QUERY ); - OUString PathString(xCfgMgr->substituteVariables(OUString(RTL_CONSTASCII_USTRINGPARAM("$(progurl)")))); + OUString PathString(xCfgMgr->substituteVariables(OUString("$(progurl)"))); PathString = PathString.concat(OUString( "/" )); msTemplateName=PathString.concat(msTemplateName); } @@ -388,8 +388,8 @@ Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) { Sequence < OUString > aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) ); - pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) ); + pArray[0] = OUString ( SERVICE_NAME1 ); + pArray[1] = OUString ( SERVICE_NAME2 ); return aRet; } #undef SERVICE_NAME1 diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx index c9127d54dbc4..12cc401854b3 100644 --- a/filter/source/xsltdialog/typedetectionimport.cxx +++ b/filter/source/xsltdialog/typedetectionimport.cxx @@ -37,19 +37,19 @@ using namespace std; TypeDetectionImporter::TypeDetectionImporter( Reference< XMultiServiceFactory >& xMSF ) : mxMSF(xMSF), - sRootNode( RTL_CONSTASCII_USTRINGPARAM( "oor:component-data" ) ), - sNode( RTL_CONSTASCII_USTRINGPARAM( "node" ) ), - sName( RTL_CONSTASCII_USTRINGPARAM( "oor:name" ) ), - sProp( RTL_CONSTASCII_USTRINGPARAM( "prop" ) ), - sValue( RTL_CONSTASCII_USTRINGPARAM( "value" ) ), - sUIName( RTL_CONSTASCII_USTRINGPARAM( "UIName" ) ), - sData( RTL_CONSTASCII_USTRINGPARAM( "Data" ) ), - sFilters( RTL_CONSTASCII_USTRINGPARAM( "Filters" ) ), - sTypes( RTL_CONSTASCII_USTRINGPARAM( "Types" ) ), - sFilterAdaptorService( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XmlFilterAdaptor" ) ), - sXSLTFilterService( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.documentconversion.XSLTFilter" ) ), - sCdataAttribute( RTL_CONSTASCII_USTRINGPARAM( "CDATA" ) ), - sWhiteSpace( RTL_CONSTASCII_USTRINGPARAM( " " ) ) + sRootNode( "oor:component-data" ), + sNode( "node" ), + sName( "oor:name" ), + sProp( "prop" ), + sValue( "value" ), + sUIName( "UIName" ), + sData( "Data" ), + sFilters( "Filters" ), + sTypes( "Types" ), + sFilterAdaptorService( "com.sun.star.comp.Writer.XmlFilterAdaptor" ), + sXSLTFilterService( "com.sun.star.documentconversion.XSLTFilter" ), + sCdataAttribute( "CDATA" ), + sWhiteSpace( " " ) { } diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index 9d2eee03a2c5..12241c771286 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -62,12 +62,12 @@ using ::rtl::Uri; XMLFilterJarHelper::XMLFilterJarHelper( Reference< XMultiServiceFactory >& xMSF ) : mxMSF( xMSF ), - sVndSunStarPackage( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) ), - sXSLTPath( RTL_CONSTASCII_USTRINGPARAM( "$(user)/xslt/" ) ), - sTemplatePath( RTL_CONSTASCII_USTRINGPARAM( "$(user)/template/") ), - sSpecialConfigManager( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" ) ), - sPump( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.Pump" ) ), - sProgPath( RTL_CONSTASCII_USTRINGPARAM( "$(prog)/" ) ) + sVndSunStarPackage( "vnd.sun.star.Package:" ), + sXSLTPath( "$(user)/xslt/" ), + sTemplatePath( "$(user)/template/" ), + sSpecialConfigManager( "com.sun.star.config.SpecialConfigManager" ), + sPump( "com.sun.star.io.Pump" ), + sProgPath( "$(prog)/" ) { try { diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 6f98e56b31aa..51bb4e49c336 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -435,7 +435,7 @@ uno::Reference< sheet::XFormulaOpCodeMapper > FormulaDlg_Impl::GetFormulaOpCodeM uno::Sequence< OUString > aArgs(3); aArgs[TOKEN_OPEN] = OUString("("); - aArgs[TOKEN_CLOSE] = OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + aArgs[TOKEN_CLOSE] = OUString(")"); aArgs[TOKEN_SEP] = OUString(";"); m_aSeparatorsOpCodes = m_xOpCodeMapper->getMappings(aArgs,sheet::FormulaLanguage::ODFF); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index a4eaec8b3011..6787f8da947b 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -2176,7 +2176,7 @@ short SvtFileDialog::PrepareExecute() // if applicable set respectively create filter for all files if ( !bHasAll ) { - SvtFileDialogFilter_Impl* pAllFilter = implAddFilter( aAll, OUString(RTL_CONSTASCII_USTRINGPARAM(FILEDIALOG_FILTER_ALL)) ); + SvtFileDialogFilter_Impl* pAllFilter = implAddFilter( aAll, OUString(FILEDIALOG_FILTER_ALL) ); _pImp->InsertFilterListEntry( pAllFilter ); _pImp->SetCurFilter( pAllFilter, aAll ); } diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 421a413e89b2..93ca44481125 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -70,7 +70,7 @@ ToolbarLayoutManager::ToolbarLayoutManager( m_aFullAddonTbxPrefix( "private:resource/toolbar/addon_" ), m_aCustomTbxPrefix( "custom_" ), m_aCustomizeCmd( "ConfigureDialog" ), - m_aToolbarTypeString( RTL_CONSTASCII_USTRINGPARAM( UIRESOURCETYPE_TOOLBAR )) + m_aToolbarTypeString( UIRESOURCETYPE_TOOLBAR ) { // initialize rectangles to zero values setZeroRectangle( m_aDockingAreaOffsets ); diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 507d9162d491..9541000f5fe1 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -337,7 +337,7 @@ void CacheLockGuard::unlock() { OSL_FAIL("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)"); throw css::uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)")), + OUString("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)"), m_xOwner); } aWriteLock.unlock(); diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index 869df60d8e9f..b3ec68fa969a 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -76,7 +76,7 @@ void TestBreakIterator::testLineBreaking() //See https://bugs.freedesktop.org/show_bug.cgi?id=31271 { - OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)")); + OUString aTest("(some text here)"); aLocale.Language = OUString("en"); aLocale.Country = OUString("US"); diff --git a/include/test/util/xsearchable.hxx b/include/test/util/xsearchable.hxx index c7dfc210c834..4c83dc89abef 100644 --- a/include/test/util/xsearchable.hxx +++ b/include/test/util/xsearchable.hxx @@ -15,7 +15,7 @@ class OOO_DLLPUBLIC_TEST XSearchable { public: XSearchable(const OUString& rString, sal_Int32 nCount) : maSearchString(rString), mnCount(nCount) {} - XSearchable() : maSearchString(RTL_CONSTASCII_USTRINGPARAM("SearchString")), mnCount(1) {} + XSearchable() : maSearchString("SearchString"), mnCount(1) {} virtual ~XSearchable(); void testFindFirst(); diff --git a/include/uno/current_context.hxx b/include/uno/current_context.hxx index 5812db74700c..dbade9c04cca 100644 --- a/include/uno/current_context.hxx +++ b/include/uno/current_context.hxx @@ -44,7 +44,7 @@ inline Reference< XCurrentContext > SAL_CALL getCurrentContext() SAL_THROW(()) { Reference< XCurrentContext > xRet; - ::rtl::OUString aEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ); + ::rtl::OUString aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME ); ::uno_getCurrentContext( (void **)&xRet, aEnvTypeName.pData, 0 ); return xRet; } @@ -57,7 +57,7 @@ inline bool SAL_CALL setCurrentContext( Reference< XCurrentContext > const & xContext ) SAL_THROW(()) { - ::rtl::OUString aEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ); + ::rtl::OUString aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME ); return (::uno_setCurrentContext( xContext.get(), aEnvTypeName.pData, 0 ) != sal_False); } @@ -97,7 +97,7 @@ public: //__________________________________________________________________________________________________ inline ContextLayer::ContextLayer( Reference< XCurrentContext > const & xNewContext ) SAL_THROW(()) - : m_aEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ) + : m_aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME ) { ::uno_getCurrentContext( (void **)&m_xPreviousContext, m_aEnvTypeName.pData, 0 ); ::uno_setCurrentContext( xNewContext.get(), m_aEnvTypeName.pData, 0 ); diff --git a/include/uno/environment.hxx b/include/uno/environment.hxx index 5fd8633c6e9f..272a069d331f 100644 --- a/include/uno/environment.hxx +++ b/include/uno/environment.hxx @@ -55,7 +55,7 @@ public: respectively to current C++ Environment. @since UDK 3.2.7 */ - inline static Environment getCurrent(rtl::OUString const & typeName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV)))) SAL_THROW(()); + inline static Environment getCurrent(rtl::OUString const & typeName = rtl::OUString(CPPU_STRINGIFY(CPPU_ENV))) SAL_THROW(()); /// @cond INTERNAL // these are here to force memory de/allocation to sal lib. diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx index 13a042833ad6..f4340b58df9b 100644 --- a/include/uno/mapping.hxx +++ b/include/uno/mapping.hxx @@ -305,8 +305,8 @@ template< class C > inline sal_Bool mapToCpp( Reference< C > * ppRet, uno_Interface * pUnoI ) SAL_THROW(()) { Mapping aMapping( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ) ); + ::rtl::OUString( UNO_LB_UNO ), + ::rtl::OUString( CPPU_CURRENT_LANGUAGE_BINDING_NAME ) ); OSL_ASSERT( aMapping.is() ); aMapping.mapInterface( (void **)ppRet, pUnoI, ::cppu::getTypeFavourUnsigned( ppRet ) ); @@ -328,8 +328,8 @@ template< class C > inline sal_Bool mapToUno( uno_Interface ** ppRet, const Reference< C > & x ) SAL_THROW(()) { Mapping aMapping( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ) ); + ::rtl::OUString( CPPU_CURRENT_LANGUAGE_BINDING_NAME ), + ::rtl::OUString( UNO_LB_UNO ) ); OSL_ASSERT( aMapping.is() ); aMapping.mapInterface( (void **)ppRet, x.get(), ::cppu::getTypeFavourUnsigned( &x ) ); diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx index 36ad7049d95f..e1dc80535568 100644 --- a/io/source/stm/opipe.cxx +++ b/io/source/stm/opipe.cxx @@ -453,13 +453,13 @@ Reference < XInterface > SAL_CALL OPipeImpl_CreateInstance( OUString OPipeImpl_getImplementationName() { - return OUString( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString( IMPLEMENTATION_NAME ); } Sequence<OUString> OPipeImpl_getSupportedServiceNames(void) { Sequence<OUString> aRet(1); - aRet.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME )); + aRet.getArray()[0] = OUString( SERVICE_NAME ); return aRet; } } diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index e43023650017..0ba0b5fdea6c 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/javaunohelper/source/javaunohelper.cxx @@ -68,7 +68,7 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( if (lib) { // ========================= LATEST VERSION ========================= - OUString aGetEnvName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETENV) ); + OUString aGetEnvName( COMPONENT_GETENV ); oslGenericFunction pSym = osl_getFunctionSymbol( lib, aGetEnvName.pData ); if (pSym) @@ -91,7 +91,7 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( uno_getEnvironment( (uno_Environment **)&java_env, java_env_name.pData, vm_access.get() ); - OUString aWriteInfoName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_WRITEINFO) ); + OUString aWriteInfoName( COMPONENT_WRITEINFO ); pSym = osl_getFunctionSymbol( lib, aWriteInfoName.pData ); if (pSym) { @@ -151,7 +151,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( OUString aLibName( pJLibName ); pJEnv->ReleaseStringChars( jLibName, pJLibName); - aLibName += OUString( RTL_CONSTASCII_USTRINGPARAM(SAL_DLLEXTENSION) ); + aLibName += OUString( SAL_DLLEXTENSION ); jobject joSLL_cpp = 0; @@ -160,7 +160,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( if (lib) { // ========================= LATEST VERSION ========================= - OUString aGetEnvName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETENV) ); + OUString aGetEnvName( COMPONENT_GETENV ); oslGenericFunction pSym = osl_getFunctionSymbol( lib, aGetEnvName.pData ); if (pSym) @@ -184,7 +184,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( uno_getEnvironment( (uno_Environment **)&java_env, java_env_name.pData, vm_access.get() ); - OUString aGetFactoryName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETFACTORY) ); + OUString aGetFactoryName( COMPONENT_GETFACTORY ); pSym = osl_getFunctionSymbol( lib, aGetFactoryName.pData ); if (pSym) { diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx index 6b518f38bc1f..511887406bae 100644 --- a/javaunohelper/source/vm.cxx +++ b/javaunohelper/source/vm.cxx @@ -109,9 +109,8 @@ namespace javaunohelper { } catch ( ::jvmaccess::UnoVirtualMachine::CreationException & ) { throw css::uno::RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "jmvaccess::UnoVirtualMachine::CreationException" - " occurred" ) ), + " occurred" ), css::uno::Reference< css::uno::XInterface >() ); } } diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index a9b38ffa5c0d..1619788dfd38 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -323,7 +323,7 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor) for (sal_Int32 i = 1; ; i++) { OUString sName = - OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_PARAMETER)) + + OUString(UNO_JAVA_JFW_PARAMETER) + OUString::valueOf(i); OUString sValue; if (Bootstrap::get()->getFrom(sName, sValue) == sal_True) @@ -358,7 +358,7 @@ OString BootParams::getClasspath() OString sClassPath; OUString sCP; if (Bootstrap::get()->getFrom( - OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_CLASSPATH)), + OUString(UNO_JAVA_JFW_CLASSPATH), sCP) == sal_True) { sClassPath = OUStringToOString( @@ -371,7 +371,7 @@ OString BootParams::getClasspath() OUString sEnvCP; if (Bootstrap::get()->getFrom( - OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_CLASSPATH)), + OUString(UNO_JAVA_JFW_ENV_CLASSPATH), sEnvCP) == sal_True) { char * pCp = getenv("CLASSPATH"); @@ -393,7 +393,7 @@ OUString BootParams::getVendorSettings() { OUString sVendor; OUString sName( - RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_VENDOR_SETTINGS)); + UNO_JAVA_JFW_VENDOR_SETTINGS); if (Bootstrap::get()->getFrom(sName ,sVendor) == sal_True) { //check the value of the bootstrap variable @@ -433,9 +433,9 @@ OUString BootParams::getJREHome() OUString sJRE; OUString sEnvJRE; sal_Bool bJRE = Bootstrap::get()->getFrom( - OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_JREHOME)) ,sJRE); + OUString(UNO_JAVA_JFW_JREHOME) ,sJRE); sal_Bool bEnvJRE = Bootstrap::get()->getFrom( - OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_JREHOME)) ,sEnvJRE); + OUString(UNO_JAVA_JFW_ENV_JREHOME) ,sEnvJRE); if (bJRE == sal_True && bEnvJRE == sal_True) { @@ -496,7 +496,7 @@ OUString BootParams::getClasspathUrls() { OUString sParams; Bootstrap::get()->getFrom( - OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_CLASSPATH_URLS)), + OUString(UNO_JAVA_JFW_CLASSPATH_URLS), sParams); #if OSL_DEBUG_LEVEL >=2 OString sValue = OUStringToOString(sParams, osl_getThreadTextEncoding()); @@ -518,23 +518,23 @@ JFW_MODE getMode() OUString sValue; const rtl::Bootstrap * aBoot = Bootstrap::get(); OUString sJREHome( - RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_JREHOME)); + UNO_JAVA_JFW_JREHOME); if (aBoot->getFrom(sJREHome, sValue) == sal_False) { OUString sEnvJRE( - RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_JREHOME)); + UNO_JAVA_JFW_ENV_JREHOME); if (aBoot->getFrom(sEnvJRE, sValue) == sal_False) { OUString sClasspath( - RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_CLASSPATH)); + UNO_JAVA_JFW_CLASSPATH); if (aBoot->getFrom(sClasspath, sValue) == sal_False) { OUString sEnvClasspath( - RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_CLASSPATH)); + UNO_JAVA_JFW_ENV_CLASSPATH); if (aBoot->getFrom(sEnvClasspath, sValue) == sal_False) { OUString sParams = OUString( - RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_PARAMETER)) + + UNO_JAVA_JFW_PARAMETER) + OUString::valueOf((sal_Int32)1); if (aBoot->getFrom(sParams, sValue) == sal_False) { diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index 30249d44b372..c87191fd4b94 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -427,7 +427,7 @@ ORegistry::ORegistry() : m_refCount(1) , m_readOnly(sal_False) , m_isOpen(sal_False) - , ROOT( RTL_CONSTASCII_USTRINGPARAM("/") ) + , ROOT( "/" ) { } diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx index 87421f072434..334991a6eb7a 100644 --- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx +++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx @@ -51,13 +51,13 @@ namespace unourl_resolver Sequence< OUString > resolver_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); + seqNames.getArray()[0] = OUString(SERVICENAME); return seqNames; } OUString resolver_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } //================================================================================================== diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 85940c1605fc..e715ed56bc08 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1799,7 +1799,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue aStorageSource <<= sURL; else throw lang::IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM( "No input source (URL or InputStream) found." ) ), + OUString( "No input source (URL or InputStream) found." ), // TODO: resource *this, 1 @@ -2112,7 +2112,7 @@ void SAL_CALL OReportDefinition::setMimeType( const OUString& _mimetype ) throw uno::Sequence< OUString > aList = getAvailableMimeTypes(); const OUString* pEnd = aList.getConstArray()+aList.getLength(); if ( ::std::find(aList.getConstArray(),pEnd,_mimetype) == pEnd ) - throwIllegallArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("getAvailableMimeTypes()")) + throwIllegallArgumentException(OUString("getAvailableMimeTypes()") ,*this ,1 ,m_aProps->m_xContext); diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 57ac5aaecbff..6a7ad00e66e3 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -120,10 +120,10 @@ SvXMLImportContext* OXMLCell::CreateChildContext( } break; case XML_TOK_PAGE_NUMBER: - m_sText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageNumber()")); + m_sText += s_sStringConcat + OUString(" PageNumber()"); break; case XML_TOK_PAGE_COUNT: - m_sText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageCount()")); + m_sText += s_sStringConcat + OUString(" PageCount()"); break; case XML_TOK_FORMATTED_TEXT: { @@ -258,7 +258,7 @@ void OXMLCell::Characters( const OUString& rChars ) { if ( !rChars.isEmpty() ) { - static const OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\"")); + static const OUString s_Quote("\""); if ( !m_sText.isEmpty() ) { static const OUString s_sStringConcat(" & "); diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 713611fbe1ba..60a93cbf3d89 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -293,14 +293,14 @@ ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext,sal_uInt GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_TEXT_PARAGRAPH, sFamily, m_xParaPropMapper, aPrefix ); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), - m_xCellStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME)), - m_xColumnStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)), - m_xRowStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)), - m_xTableStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME), + m_xCellStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME), + m_xColumnStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX)); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME), + m_xRowStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX)); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME), + m_xTableStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX)); } // ----------------------------------------------------------------------------- Reference< XInterface > ORptExport::create(Reference< XComponentContext > const & xContext) @@ -1027,8 +1027,8 @@ OUString ORptExport::convertFormula(const OUString& _sFormula) bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OUString& _sFormula) { const OUString sFieldData = convertFormula(_sFormula); - static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()")); - static const OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()")); + static const OUString s_sPageNumber("PageNumber()"); + static const OUString s_sPageCount("PageCount()"); sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber); sal_Int32 nPageCountIndex = sFieldData.indexOf(s_sPageCount); bool bRet = nPageNumberIndex != -1 || nPageCountIndex != -1; @@ -1086,20 +1086,20 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef OUString sExpression = sField; if ( !sExpression.isEmpty() ) { - static OUString s_sQuote(RTL_CONSTASCII_USTRINGPARAM("\"\"")); + static OUString s_sQuote("\"\""); sal_Int32 nIndex = sExpression.indexOf('"'); while ( nIndex > -1 ) { sExpression = sExpression.replaceAt(nIndex,1,s_sQuote); nIndex = sExpression.indexOf('"',nIndex+2); } - OUString sFormula(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\"")); + OUString sFormula("rpt:HASCHANGED(\""); TGroupFunctionMap::iterator aGroupFind = m_aGroupFunctionMap.find(xGroup); if ( aGroupFind != m_aGroupFunctionMap.end() ) sExpression = aGroupFind->second->getName(); sFormula += sExpression; - sFormula += OUString(RTL_CONSTASCII_USTRINGPARAM("\")")); + sFormula += OUString("\")"); sExpression = sFormula; } AddAttribute(XML_NAMESPACE_REPORT, XML_SORT_EXPRESSION, sField); @@ -1425,8 +1425,8 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor if ( Reference<XFormattedField>(_xReportElement,uno::UNO_QUERY).is() ) { OUString sFieldData = _xReportElement->getDataField(); - static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()")); - static const OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()")); + static const OUString s_sPageNumber("PageNumber()"); + static const OUString s_sPageCount("PageCount()"); static const OUString s_sReportPrefix("rpt:"); sFieldData = sFieldData.copy(s_sReportPrefix.getLength(),sFieldData.getLength() - s_sReportPrefix.getLength()); sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber); @@ -1543,7 +1543,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG break; case report::GroupOn::QUARTAL: sFunction = OUString("INT((MONTH"); - sPostfix = OUString(RTL_CONSTASCII_USTRINGPARAM("-1)/3)+1")); + sPostfix = OUString("-1)/3)+1"); sFunctionName = OUString("QUARTAL_") + sExpression; break; case report::GroupOn::MONTH: @@ -1573,7 +1573,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG sExpression = sCountName; // The reference to sCountName in the formula of sFunctionName refers to the *old* value // so we need to expand the the formula of sCountName - sPrefix = OUString(RTL_CONSTASCII_USTRINGPARAM(" + 1) / ")) + OUString::valueOf(xGroup->getGroupInterval()); + sPrefix = OUString(" + 1) / ") + OUString::valueOf(xGroup->getGroupInterval()); sFunctionName = sFunction + OUString("_") + sExpression; sFunction = sFunction + OUString("("); sInitialFormula = OUString("rpt:0"); @@ -1600,7 +1600,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG if ( !sPrefix.isEmpty() ) sFunction += sPrefix; - sFunction += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sFunction += OUString(")"); if ( !sPostfix.isEmpty() ) sFunction += sPostfix; xFunction->setFormula(sFunction); diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 2a89840d0a7b..ba3bab90cb01 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -167,11 +167,11 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext( 0x0020, sal_True ); break; case XML_TOK_PAGE_NUMBER: - m_sPageText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageNumber()")); + m_sPageText += s_sStringConcat + OUString(" PageNumber()"); m_bFormattedField = true; break; case XML_TOK_PAGE_COUNT: - m_sPageText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageCount()")); + m_sPageText += s_sStringConcat + OUString(" PageCount()"); m_bFormattedField = true; break; default: @@ -215,7 +215,7 @@ void OXMLFixedContent::Characters( const OUString& rChars ) m_sLabel += rChars; if ( !rChars.isEmpty() ) { - static const OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\"")); + static const OUString s_Quote("\""); if ( !m_sPageText.isEmpty() ) { static const OUString s_sStringConcat(" & "); diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index 7e074d05c0e5..31c262ffa13f 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -66,7 +66,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, break; case XML_TOK_SELECT_PAGE: { - static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("rpt:PageNumber()")); + static const OUString s_sPageNumber("rpt:PageNumber()"); _xComponent->setDataField(s_sPageNumber); } break; @@ -76,7 +76,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, } if ( _bPageCount ) { - static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("rpt:PageCount()")); + static const OUString s_sPageNumber("rpt:PageCount()"); _xComponent->setDataField(s_sPageNumber); } } diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index 9a521952b0c5..6fc2f92018e0 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -94,15 +94,15 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport if ( nLen ) { - const static OUString s_sChanged(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\"")); + const static OUString s_sChanged("rpt:HASCHANGED(\""); sal_Int32 nPos = sValue.indexOf(s_sChanged); if ( nPos == -1 ) nPos = 5; else { nPos = s_sChanged.getLength(); - static OUString s_sQuote(RTL_CONSTASCII_USTRINGPARAM("\"\"")); - static OUString s_sSingleQuote(RTL_CONSTASCII_USTRINGPARAM("\"")); + static OUString s_sQuote("\"\""); + static OUString s_sSingleQuote("\""); sal_Int32 nIndex = sValue.indexOf(s_sQuote,nPos); while ( nIndex > -1 ) { diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index 1898e502ce1b..4b80bcf1bbea 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -167,10 +167,10 @@ OReportStylesContext::OReportStylesContext( ORptFilter& rImport, const Reference< XAttributeList > & xAttrList, const sal_Bool bTempAutoStyles ) : SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ), - m_sTableStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))), - m_sColumnStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), - m_sRowStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))), - m_sCellStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME ))), + m_sTableStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME )), + m_sColumnStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME )), + m_sRowStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME )), + m_sCellStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME )), m_rImport(rImport), m_nNumberFormatIndex(-1), bAutoStyles(bTempAutoStyles) diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index b469499f6f7c..ece222b96789 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -1875,7 +1875,7 @@ sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference< xub_StrLen end = sFormula.Len(); if ( aTextSearch.SearchFrwrd(sFormula,&start,&end) && start == 0 && end == sFormula.Len()) // default function found { - aSearchOptions.searchString = OUString(RTL_CONSTASCII_USTRINGPARAM("\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]")); + aSearchOptions.searchString = OUString("\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]"); utl::TextSearch aDataSearch(aSearchOptions); aDataSearch.SearchFrwrd(sFormula,&start,&end ); ++start; @@ -1902,7 +1902,7 @@ void GeometryHandler::loadDefaultFunctions() m_aCounterFunction.m_bDeepTraversing = sal_False; m_aCounterFunction.m_sName = String(ModuleRes(RID_STR_F_COUNTER)); m_aCounterFunction.m_sFormula = OUString("rpt:[%FunctionName] + 1"); - m_aCounterFunction.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*")); + m_aCounterFunction.m_sSearchString = OUString("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*"); m_aCounterFunction.m_sInitialFormula.IsPresent = sal_True; m_aCounterFunction.m_sInitialFormula.Value = OUString("rpt:1"); @@ -1913,21 +1913,21 @@ void GeometryHandler::loadDefaultFunctions() aDefault.m_sName = String(ModuleRes(RID_STR_F_ACCUMULATION)); aDefault.m_sFormula = OUString("rpt:[%Column] + [%FunctionName]"); - aDefault.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]")); + aDefault.m_sSearchString = OUString("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]"); aDefault.m_sInitialFormula.IsPresent = sal_True; aDefault.m_sInitialFormula.Value = OUString("rpt:[%Column]"); m_aDefaultFunctions.push_back(aDefault); aDefault.m_sName = String(ModuleRes(RID_STR_F_MINIMUM)); - aDefault.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF([%Column] < [%FunctionName];[%Column];[%FunctionName])")); - aDefault.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*<[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)")); + aDefault.m_sFormula = OUString("rpt:IF([%Column] < [%FunctionName];[%Column];[%FunctionName])"); + aDefault.m_sSearchString = OUString("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*<[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)"); aDefault.m_sInitialFormula.IsPresent = sal_True; aDefault.m_sInitialFormula.Value = OUString("rpt:[%Column]"); m_aDefaultFunctions.push_back(aDefault); aDefault.m_sName = String(ModuleRes(RID_STR_F_MAXIMUM)); - aDefault.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF([%Column] > [%FunctionName];[%Column];[%FunctionName])")); - aDefault.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*>[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)")); + aDefault.m_sFormula = OUString("rpt:IF([%Column] > [%FunctionName];[%Column];[%FunctionName])"); + aDefault.m_sSearchString = OUString("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*>[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)"); aDefault.m_sInitialFormula.IsPresent = sal_True; aDefault.m_sInitialFormula.Value = OUString("rpt:[%Column]"); m_aDefaultFunctions.push_back(aDefault); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index aa56679522ec..66fe96caffa3 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -3253,13 +3253,13 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs) sal_Bool bDate = aMap.getUnpackedValueOrDefault(PROPERTY_DATE_STATE,sal_False); if ( bDate ) { - sFunction = OUString (RTL_CONSTASCII_USTRINGPARAM("TODAY()")); + sFunction = OUString ("TODAY()"); createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction); } sal_Bool bTime = aMap.getUnpackedValueOrDefault(PROPERTY_TIME_STATE,sal_False); if ( bTime ) { - sFunction = OUString (RTL_CONSTASCII_USTRINGPARAM("TIMEVALUE(NOW())")); + sFunction = OUString ("TIMEVALUE(NOW())"); aMap[PROPERTY_FORMATKEY] <<= aMap.getUnpackedValueOrDefault(PROPERTY_FORMATKEYTIME,sal_Int32(0)); createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction); } @@ -3282,12 +3282,12 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs sal_Bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE,sal_False); String sFunction = String(ModuleRes(STR_RPT_PN_PAGE)); - OUString sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()")); + OUString sPageNumber("PageNumber()"); sFunction.SearchAndReplace(OUString("#PAGENUMBER#"),sPageNumber); if ( bStateOfPage ) { - OUString sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()")); + OUString sPageCount("PageCount()"); sFunction += String(ModuleRes(STR_RPT_PN_PAGE_OF)); sFunction.SearchAndReplace(OUString("#PAGECOUNT#"),sPageCount); } diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx index 39cdbaac8e62..c70a0dc7b690 100644 --- a/sal/osl/all/debugbase.cxx +++ b/sal/osl/all/debugbase.cxx @@ -45,7 +45,7 @@ struct StaticDebugBaseAddressFilter OStringVec vec; rtl_uString * pStr = 0; rtl::OUString const name( - RTL_CONSTASCII_USTRINGPARAM("OSL_DEBUGBASE_STORE_ADDRESSES") ); + "OSL_DEBUGBASE_STORE_ADDRESSES" ); if (osl_getEnvironment( name.pData, &pStr ) == osl_Process_E_None) { rtl::OUString const str(pStr); rtl_uString_release(pStr); diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index 57448e18ba78..fb51d63c9250 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -97,7 +97,7 @@ using ::rtl::OString; void oldtestfile::test_file_001() { #ifndef WIN32 - OUString base1( RTL_CONSTASCII_USTRINGPARAM( "file:///" TEST_VOLUME "bla" ) ); + OUString base1( "file:///" TEST_VOLUME "bla" ); int i; for( i = 0 ; aSource1[i] ; i +=2 ) { @@ -116,7 +116,7 @@ void oldtestfile::test_file_001() void oldtestfile::test_file_002() { #ifndef WIN32 - OUString base2( RTL_CONSTASCII_USTRINGPARAM( "file:///" TEST_VOLUME "bla/blubs/schnubbel" ) ); + OUString base2( "file:///" TEST_VOLUME "bla/blubs/schnubbel" ); int i; for( i = 0 ; aSource2[i] ; i +=2 ) { @@ -135,7 +135,7 @@ void oldtestfile::test_file_002() void oldtestfile::test_file_004() { #ifndef WIN32 - OUString base4( RTL_CONSTASCII_USTRINGPARAM( "file:///" TEST_VOLUME "bla/" ) ); + OUString base4( "file:///" TEST_VOLUME "bla/" ); int i; for( i = 0 ; aSource1[i] ; i +=2 ) { diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx index f380a7943aba..462a549e7440 100644 --- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx +++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx @@ -45,7 +45,7 @@ namespace { struct Gregorian : public rtl::StaticWithInit<rtl::OUString, Gregorian> { const rtl::OUString operator () () { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CONST_TEST_STRING )); + return rtl::OUString( CONST_TEST_STRING ); } }; } @@ -97,7 +97,7 @@ public: :m_nOK(0), m_nFails(0) { - m_sConstStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CONST_TEST_STRING )); + m_sConstStr = rtl::OUString( CONST_TEST_STRING ); } sal_Int32 getOK() { return m_nOK; } diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx index 005a7a75388a..e873cb7edc3c 100644 --- a/sal/qa/rtl/uri/rtl_testuri.cxx +++ b/sal/qa/rtl/uri/rtl_testuri.cxx @@ -204,8 +204,7 @@ void Test::test_Uri() { aBuffer.append(static_cast< sal_Unicode >('A')); // A aText1 = aBuffer.makeStringAndClear(); aText2 = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "%ED%A0%80" "%F0%90%8F%BF" "%ED%BF%BF" "A")); + "%ED%A0%80" "%F0%90%8F%BF" "%ED%BF%BF" "A"); CPPUNIT_ASSERT_MESSAGE( "failure 11", (rtl::Uri::encode( @@ -226,8 +225,7 @@ void Test::test_Uri() { == aText2)); aText1 = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "%ed%a0%80" "%f0%90%8f%bf" "%ed%bf%bf" "A")); + "%ed%a0%80" "%f0%90%8f%bf" "%ed%bf%bf" "A"); aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("%ED%A0%80")); aBuffer.append(static_cast< sal_Unicode >(0xD800)); aBuffer.append(static_cast< sal_Unicode >(0xDFFF)); diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 865acce66160..c6a2f74801f8 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -286,7 +286,7 @@ static OUString & getIniFileName_Impl() fileName = fileName.copy(0, fileName.getLength() - progExt.getLength()); // append config file suffix - fileName += OUString(RTL_CONSTASCII_USTRINGPARAM(SAL_CONFIGFILE(""))); + fileName += OUString(SAL_CONFIGFILE("")); } #endif @@ -491,19 +491,19 @@ bool Bootstrap_Impl::getValue( } if (key == "_OS") { rtl_uString_assign( - value, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(RTL_OS)).pData); + value, rtl::OUString(RTL_OS).pData); return true; } if (key == "_ARCH") { rtl_uString_assign( - value, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(RTL_ARCH)).pData); + value, rtl::OUString(RTL_ARCH).pData); return true; } if (key == "_CPPU_ENV") { rtl_uString_assign( value, (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(SAL_STRINGIFY(CPPU_ENV))). + SAL_STRINGIFY(CPPU_ENV)). pData)); return true; } diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 8ac6a11ab531..5b849bea9ea4 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -764,7 +764,7 @@ void XclImpAutoFilterData::CreateScDBData() if( bActive || bCriteria) { ScDocument* pDoc = pExcRoot->pIR->GetDocPtr(); - String aNewName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + String aNewName = OUString(STR_DB_LOCAL_NONAME); pCurrDBData = new ScDBData(aNewName , Tab(), StartCol(),StartRow(), EndCol(),EndRow() ); if(bCriteria) diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index cab727e8b279..1cec3de46a9d 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -80,7 +80,7 @@ FltError ExportBiff5::Write() SvxImportMSVBasic aBasicImport( *pDocShell, *xRootStrg ); sal_uLong nErr = aBasicImport.SaveOrDelMSVBAStorage( sal_True, EXC_STORAGE_VBA_PROJECT ); if( nErr != ERRCODE_NONE ) - pDocShell->SetError( nErr, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + pDocShell->SetError( nErr, OUString( OSL_LOG_PREFIX ) ); } pExcDoc->ReadDoc(); // ScDoc -> ExcDoc diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 64e0ee7691a9..dacbb1dfd8f6 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -1150,7 +1150,7 @@ bool XclExpXmlStream::exportDocument() throw() OUString XlsxExport_getImplementationName() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME ) ); + return OUString( IMPL_NAME ); } ::oox::ole::VbaProject* XclExpXmlStream::implCreateVbaProject() const diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 1bb40c6f4a24..3538ddec7125 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -453,9 +453,9 @@ OUString XclTools::GetXclFontName( const OUString& rFontName ) // built-in defined names ----------------------------------------------------- -const OUString XclTools::maDefNamePrefix( RTL_CONSTASCII_USTRINGPARAM( "Excel_BuiltIn_" ) ); +const OUString XclTools::maDefNamePrefix( "Excel_BuiltIn_" ); -const OUString XclTools::maDefNamePrefixXml ( RTL_CONSTASCII_USTRINGPARAM( "_xlnm." ) ); +const OUString XclTools::maDefNamePrefixXml ( "_xlnm." ); static const sal_Char* const ppcDefNames[] = { @@ -524,8 +524,8 @@ sal_Unicode XclTools::GetBuiltInDefNameIndex( const OUString& rDefName ) // built-in style names ------------------------------------------------------- -const OUString XclTools::maStyleNamePrefix1( RTL_CONSTASCII_USTRINGPARAM( "Excel_BuiltIn_" ) ); -const OUString XclTools::maStyleNamePrefix2( RTL_CONSTASCII_USTRINGPARAM( "Excel Built-in " ) ); +const OUString XclTools::maStyleNamePrefix1( "Excel_BuiltIn_" ); +const OUString XclTools::maStyleNamePrefix2( "Excel Built-in " ); static const sal_Char* const ppcStyleNames[] = { @@ -647,8 +647,8 @@ bool XclTools::GetBuiltInStyleId( sal_uInt8& rnStyleId, sal_uInt8& rnLevel, cons // conditional formatting style names ----------------------------------------- -const OUString XclTools::maCFStyleNamePrefix1( RTL_CONSTASCII_USTRINGPARAM( "Excel_CondFormat_" ) ); -const OUString XclTools::maCFStyleNamePrefix2( RTL_CONSTASCII_USTRINGPARAM( "ConditionalStyle_" ) ); +const OUString XclTools::maCFStyleNamePrefix1( "Excel_CondFormat_" ); +const OUString XclTools::maCFStyleNamePrefix2( "ConditionalStyle_" ); OUString XclTools::GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition ) { @@ -688,8 +688,8 @@ void XclTools::SkipSubStream( XclImpStream& rStrm ) // Basic macro names ---------------------------------------------------------- -const OUString XclTools::maSbMacroPrefix( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:" ) ); -const OUString XclTools::maSbMacroSuffix( RTL_CONSTASCII_USTRINGPARAM( "?language=Basic&location=document" ) ); +const OUString XclTools::maSbMacroPrefix( "vnd.sun.star.script:" ); +const OUString XclTools::maSbMacroSuffix( "?language=Basic&location=document" ); OUString XclTools::GetSbMacroUrl( const OUString& rMacroName, SfxObjectShell* pDocShell ) { diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 703e7398919b..09c6947c1477 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -158,7 +158,7 @@ public: } } if ( !mpDoc ) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("Workbookhelper::getScDocument(): Failed to access ScDocument from model" ) ), Reference< XInterface >() ); + throw RuntimeException( OUString( "Workbookhelper::getScDocument(): Failed to access ScDocument from model" ), Reference< XInterface >() ); return *mpDoc; } diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index c1922811ffde..104707b4cf51 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -131,15 +131,15 @@ void ScXMLCalculationSettingsContext::EndElement() uno::Reference <beans::XPropertySet> xPropertySet (GetScImport().GetModel(), uno::UNO_QUERY); if (xPropertySet.is()) { - xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN)), uno::makeAny(bCalcAsShown) ); - xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE)), uno::makeAny(bIgnoreCase) ); - xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS)), uno::makeAny(bLookUpLabels) ); - xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE)), uno::makeAny(bMatchWholeCell) ); - xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED)), uno::makeAny(bUseRegularExpressions) ); - xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED)), uno::makeAny(bIsIterationEnabled) ); - xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT)), uno::makeAny(nIterationCount) ); - xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON)), uno::makeAny(fIterationEpsilon) ); - xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE)), uno::makeAny(aNullDate) ); + xPropertySet->setPropertyValue(OUString(SC_UNO_CALCASSHOWN), uno::makeAny(bCalcAsShown) ); + xPropertySet->setPropertyValue(OUString(SC_UNO_IGNORECASE), uno::makeAny(bIgnoreCase) ); + xPropertySet->setPropertyValue(OUString(SC_UNO_LOOKUPLABELS), uno::makeAny(bLookUpLabels) ); + xPropertySet->setPropertyValue(OUString(SC_UNO_MATCHWHOLE), uno::makeAny(bMatchWholeCell) ); + xPropertySet->setPropertyValue(OUString(SC_UNO_REGEXENABLED), uno::makeAny(bUseRegularExpressions) ); + xPropertySet->setPropertyValue(OUString(SC_UNO_ITERENABLED), uno::makeAny(bIsIterationEnabled) ); + xPropertySet->setPropertyValue( OUString(SC_UNO_ITERCOUNT), uno::makeAny(nIterationCount) ); + xPropertySet->setPropertyValue( OUString(SC_UNO_ITEREPSILON), uno::makeAny(fIterationEpsilon) ); + xPropertySet->setPropertyValue( OUString(SC_UNO_NULLDATE), uno::makeAny(aNullDate) ); if (GetScImport().GetDocument()) { ScXMLImport::MutexGuard aGuard(GetScImport()); diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index d4bcd4e0f2ff..d6b60eb60231 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -47,7 +47,7 @@ ScChangeTrackingExportHelper::ScChangeTrackingExportHelper(ScXMLExport& rTempExp pChangeTrack(NULL), pEditTextObj(NULL), pDependings(NULL), - sChangeIDPrefix(RTL_CONSTASCII_USTRINGPARAM(SC_CHANGE_ID_PREFIX)) + sChangeIDPrefix(SC_CHANGE_ID_PREFIX) { pChangeTrack = rExport.GetDocument() ? rExport.GetDocument()->GetChangeTrack() : NULL; pDependings = new ScChangeActionMap(); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index a28dd7725153..d585686c08a8 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -180,7 +180,7 @@ ScXMLChangeTrackingImportHelper::ScXMLChangeTrackingImportHelper() : pDoc(NULL), pTrack(NULL), pCurrentAction(NULL), - sIDPrefix(RTL_CONSTASCII_USTRINGPARAM(SC_CHANGE_ID_PREFIX)), + sIDPrefix(SC_CHANGE_ID_PREFIX), nMultiSpanned(0), nMultiSpannedSlaveCount(0), bChangeTrack(false) diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index 6493219cd46e..41036333bf03 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx @@ -50,8 +50,8 @@ sal_Bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, String& rCodeN XMLCodeNameProvider::XMLCodeNameProvider( ScDocument* pDoc ) : mpDoc( pDoc ), - msDocName( RTL_CONSTASCII_USTRINGPARAM("*doc*") ), - msCodeNameProp( RTL_CONSTASCII_USTRINGPARAM("CodeName") ) + msDocName( "*doc*" ), + msCodeNameProp( "CodeName" ) { } diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx b/sc/source/filter/xml/XMLExportDDELinks.cxx index 1b1626dc95c8..4c6cfdfde4bc 100644 --- a/sc/source/filter/xml/XMLExportDDELinks.cxx +++ b/sc/source/filter/xml/XMLExportDDELinks.cxx @@ -122,7 +122,7 @@ void ScXMLExportDDELinks::WriteDDELinks(uno::Reference<sheet::XSpreadsheetDocume uno::Reference <beans::XPropertySet> xPropertySet (xSpreadDoc, uno::UNO_QUERY); if (xPropertySet.is()) { - uno::Reference<container::XIndexAccess> xIndex(xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DDELINKS))), uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xIndex(xPropertySet->getPropertyValue(OUString(SC_UNO_DDELINKS)), uno::UNO_QUERY); if (xIndex.is()) { sal_Int32 nCount = xIndex->getCount(); diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index f83488a8a996..29b8ea6b1810 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -73,7 +73,7 @@ ScMyEmptyDatabaseRangesContainer ScXMLExportDatabaseRanges::GetEmptyDatabaseRang uno::Reference <beans::XPropertySet> xPropertySet (rExport.GetModel(), uno::UNO_QUERY); if (xPropertySet.is()) { - uno::Reference <sheet::XDatabaseRanges> xDatabaseRanges(xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DATABASERNG))), uno::UNO_QUERY); + uno::Reference <sheet::XDatabaseRanges> xDatabaseRanges(xPropertySet->getPropertyValue(OUString(SC_UNO_DATABASERNG)), uno::UNO_QUERY); rExport.CheckAttrList(); if (xDatabaseRanges.is()) { @@ -87,7 +87,7 @@ ScMyEmptyDatabaseRangesContainer ScXMLExportDatabaseRanges::GetEmptyDatabaseRang { uno::Reference <beans::XPropertySet> xDatabaseRangePropertySet (xDatabaseRange, uno::UNO_QUERY); if (xDatabaseRangePropertySet.is() && - ::cppu::any2bool(xDatabaseRangePropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_STRIPDAT))))) + ::cppu::any2bool(xDatabaseRangePropertySet->getPropertyValue(OUString(SC_UNONAME_STRIPDAT)))) { uno::Sequence <beans::PropertyValue> aImportProperties(xDatabaseRange->getImportDescriptor()); sal_Int32 nLength = aImportProperties.getLength(); diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 4f7a9375b965..b791e8195330 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -83,22 +83,22 @@ bool ScMyValidation::IsEqual(const ScMyValidation& aVal) const ScMyValidationsContainer::ScMyValidationsContainer() : aValidationVec(), sEmptyString(), - sERRALSTY(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ERRALSTY)), - sIGNOREBL(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_IGNOREBL)), - sSHOWLIST(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SHOWLIST)), - sTYPE(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_TYPE)), - sSHOWINP(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SHOWINP)), - sSHOWERR(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SHOWERR)), - sINPTITLE(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_INPTITLE)), - sINPMESS(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_INPMESS)), - sERRTITLE(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ERRTITLE)), - sERRMESS(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ERRMESS)), - sOnError(RTL_CONSTASCII_USTRINGPARAM("OnError")), - sEventType(RTL_CONSTASCII_USTRINGPARAM("EventType")), - sStarBasic(RTL_CONSTASCII_USTRINGPARAM("StarBasic")), - sScript(RTL_CONSTASCII_USTRINGPARAM("Script")), - sLibrary(RTL_CONSTASCII_USTRINGPARAM("Library")), - sMacroName(RTL_CONSTASCII_USTRINGPARAM("MacroName")) + sERRALSTY(SC_UNONAME_ERRALSTY), + sIGNOREBL(SC_UNONAME_IGNOREBL), + sSHOWLIST(SC_UNONAME_SHOWLIST), + sTYPE(SC_UNONAME_TYPE), + sSHOWINP(SC_UNONAME_SHOWINP), + sSHOWERR(SC_UNONAME_SHOWERR), + sINPTITLE(SC_UNONAME_INPTITLE), + sINPMESS(SC_UNONAME_INPMESS), + sERRTITLE(SC_UNONAME_ERRTITLE), + sERRMESS(SC_UNONAME_ERRMESS), + sOnError("OnError"), + sEventType("EventType"), + sStarBasic("StarBasic"), + sScript("Script"), + sLibrary("Library"), + sMacroName("MacroName") { } @@ -188,26 +188,26 @@ OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMy { //case sheet::ValidationType_CUSTOM case sheet::ValidationType_DATE : - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-date()")); + sCondition += OUString("cell-content-is-date()"); break; case sheet::ValidationType_DECIMAL : - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-decimal-number()")); + sCondition += OUString("cell-content-is-decimal-number()"); break; case sheet::ValidationType_LIST : sCondition += OUString("cell-content-is-in-list("); sCondition += aValidation.sFormula1; - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(")"); break; case sheet::ValidationType_TEXT_LEN : if (aValidation.aOperator != sheet::ConditionOperator_BETWEEN && aValidation.aOperator != sheet::ConditionOperator_NOT_BETWEEN) - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-text-length()")); + sCondition += OUString("cell-content-text-length()"); break; case sheet::ValidationType_TIME : - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-time()")); + sCondition += OUString("cell-content-is-time()"); break; case sheet::ValidationType_WHOLE : - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-whole-number()")); + sCondition += OUString("cell-content-is-whole-number()"); break; default: { @@ -226,7 +226,7 @@ OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMy aValidation.aOperator != sheet::ConditionOperator_NOT_BETWEEN) { if (aValidation.aValidationType != sheet::ValidationType_TEXT_LEN) - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); + sCondition += OUString("cell-content()"); switch (aValidation.aOperator) { case sheet::ConditionOperator_EQUAL : @@ -273,7 +273,7 @@ OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMy sCondition += aValidation.sFormula1; sCondition += OUString(","); sCondition += aValidation.sFormula2; - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(")"); } } else diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx index 528139318b7f..dcec6c88c0f6 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx @@ -109,13 +109,13 @@ void XMLTableMasterPageExport::exportMasterPageContent( const Reference < XPropertySet > & rPropSet, sal_Bool bAutoStyles ) { - Reference < sheet::XHeaderFooterContent > xHeader(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTHDRCON ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xHeader(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_RIGHTHDRCON ) ), uno::UNO_QUERY); - Reference < sheet::XHeaderFooterContent > xHeaderLeft(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTHDRCONT ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xHeaderLeft(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_LEFTHDRCONT ) ), uno::UNO_QUERY); - Reference < sheet::XHeaderFooterContent > xFooter(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTFTRCON ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xFooter(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_RIGHTFTRCON ) ), uno::UNO_QUERY); - Reference < sheet::XHeaderFooterContent > xFooterLeft(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTFTRCONT ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xFooterLeft(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_LEFTFTRCONT ) ), uno::UNO_QUERY); if( bAutoStyles ) { @@ -146,19 +146,19 @@ void XMLTableMasterPageExport::exportMasterPageContent( } else { - sal_Bool bHeader(::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRON ) ) ))); + sal_Bool bHeader(::cppu::any2bool(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_HDRON ) ))); exportHeaderFooter(xHeader, XML_HEADER, bHeader ); - sal_Bool bLeftHeader(!::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRSHARED ) ) )) && bHeader); + sal_Bool bLeftHeader(!::cppu::any2bool(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_HDRSHARED ) )) && bHeader); exportHeaderFooter( xHeaderLeft, XML_HEADER_LEFT, bLeftHeader ); - sal_Bool bFooter(::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRON ) ) ))); + sal_Bool bFooter(::cppu::any2bool(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_FTRON ) ))); exportHeaderFooter( xFooter, XML_FOOTER, bFooter ); - sal_Bool bLeftFooter = (!::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRSHARED ) ) )) && bFooter); + sal_Bool bLeftFooter = (!::cppu::any2bool(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_FTRSHARED ) )) && bFooter); exportHeaderFooter( xFooterLeft, XML_FOOTER_LEFT, bLeftFooter ); } diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index ea38a3047172..4d3010a5c584 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -61,7 +61,7 @@ void XMLTableShapeImportHelper::SetLayer(uno::Reference<drawing::XShape>& rShape { uno::Reference< beans::XPropertySet > xShapeProp( rShape, uno::UNO_QUERY ); if( xShapeProp.is() ) - xShapeProp->setPropertyValue(OUString( RTL_CONSTASCII_USTRINGPARAM( SC_LAYERID ) ), uno::makeAny(nLayerID) ); + xShapeProp->setPropertyValue(OUString( SC_LAYERID ), uno::makeAny(nLayerID) ); } } diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index 4102a685c7de..551b21e8c95e 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -145,7 +145,7 @@ void ScXMLTableColContext::EndElement() } } } - OUString sVisible(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLVIS)); + OUString sVisible(SC_UNONAME_CELLVIS); bool bValue(true); if (!IsXMLToken(sVisibility, XML_VISIBLE)) bValue = false; diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index 85f451bb7fc6..9e98d38a6c4d 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -111,7 +111,7 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport, ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), mpQueryParam(new ScQueryParam), - sDatabaseRangeName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)), + sDatabaseRangeName(STR_DB_LOCAL_NONAME), aSortSequence(), nRefresh(0), nSubTotalsUserListIndex(0), @@ -344,7 +344,7 @@ ScDBData* ScXMLDatabaseRangeContext::ConvertToDBData(const OUString& rName) size_t nOldSize = aSortSequence.getLength(); aSortSequence.realloc(nOldSize + 1); beans::PropertyValue aProperty; - aProperty.Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ORIENT)); + aProperty.Name = OUString(SC_UNONAME_ORIENT); table::TableOrientation eOrient = mpQueryParam->bByRow ? table::TableOrientation_ROWS : table::TableOrientation_COLUMNS; aProperty.Value <<= eOrient; @@ -448,7 +448,7 @@ void ScXMLDatabaseRangeContext::EndElement() if (meRangeType == ScDBCollection::SheetAnonymous) { - OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + OUString aName(STR_DB_LOCAL_NONAME); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDBData> pData(ConvertToDBData(aName)); SAL_WNODEPRECATED_DECLARATIONS_POP @@ -465,7 +465,7 @@ void ScXMLDatabaseRangeContext::EndElement() } else if (meRangeType == ScDBCollection::GlobalAnonymous) { - OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_GLOBAL_NONAME)); + OUString aName(STR_DB_GLOBAL_NONAME); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDBData> pData(ConvertToDBData(aName)); SAL_WNODEPRECATED_DECLARATIONS_POP diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 8a059e53c62c..c78c4df0ecb6 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -409,7 +409,7 @@ void ScXMLShapeExport::onExport( const uno::Reference < drawing::XShape >& xShap if( xShapeProp.is() ) { sal_Int16 nLayerID = 0; - if( (xShapeProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( SC_LAYERID ))) >>= nLayerID) && (nLayerID == SC_LAYER_BACK) ) + if( (xShapeProp->getPropertyValue(OUString( SC_LAYERID )) >>= nLayerID) && (nLayerID == SC_LAYER_BACK) ) GetExport().AddAttribute(XML_NAMESPACE_TABLE, XML_TABLE_BACKGROUND, XML_TRUE); } } @@ -456,8 +456,8 @@ ScXMLExport::ScXMLExport( pValidationsContainer(NULL), pCellsItr(NULL), pChangeTrackingExportHelper(NULL), - sLayerID(RTL_CONSTASCII_USTRINGPARAM( SC_LAYERID )), - sCaptionShape(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CaptionShape")), + sLayerID( SC_LAYERID ), + sCaptionShape("com.sun.star.drawing.CaptionShape"), nOpenRow(-1), nProgressCount(0), nCurrentTable(0), @@ -492,14 +492,14 @@ ScXMLExport::ScXMLExport( xRowStylesExportPropertySetMapper = new ScXMLRowExportPropertyMapper(xRowStylesPropertySetMapper); xTableStylesExportPropertySetMapper = new ScXMLTableExportPropertyMapper(xTableStylesPropertySetMapper); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), - xCellStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME)), - xColumnStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)), - xRowStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)), - xTableStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME), + xCellStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME), + xColumnStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX)); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME), + xRowStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX)); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME), + xTableStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX)); if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 ) { @@ -847,13 +847,13 @@ void ScXMLExport::GetAreaLinks( uno::Reference< sheet::XSpreadsheetDocument>& xS uno::Reference< beans::XPropertySet > xPropSet( xSpreadDoc, uno::UNO_QUERY ); if( !xPropSet.is() ) return; - uno::Reference< container::XIndexAccess > xLinksIAccess( xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_AREALINKS ) ) ), uno::UNO_QUERY); + uno::Reference< container::XIndexAccess > xLinksIAccess( xPropSet->getPropertyValue( OUString( SC_UNO_AREALINKS ) ), uno::UNO_QUERY); if( xLinksIAccess.is() ) { - const OUString sFilter( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FILTER ) ); - const OUString sFilterOpt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FILTOPT ) ); - const OUString sURL( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_LINKURL ) ); - const OUString sRefresh( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_REFDELAY ) ); + const OUString sFilter( SC_UNONAME_FILTER ); + const OUString sFilterOpt( SC_UNONAME_FILTOPT ); + const OUString sURL( SC_UNONAME_LINKURL ); + const OUString sRefresh( SC_UNONAME_REFDELAY ); sal_Int32 nCount(xLinksIAccess->getCount()); for( sal_Int32 nIndex = 0; nIndex < nCount; ++nIndex ) @@ -1099,7 +1099,7 @@ void ScXMLExport::ExportExternalRefCacheStyles() { bool bIsAuto; nIndex = pCellStyles->GetIndexOfStyleName( - aName, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)), bIsAuto); + aName, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX), bIsAuto); } // store the number format to index mapping for later use. @@ -1757,7 +1757,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) { uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); if (xProperties.is()) - aStylesExp.exportDefaultStyle(xProperties, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper); + aStylesExp.exportDefaultStyle(xProperties, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME), xCellStylesExportPropertySetMapper); if (pSharedData->HasShapes()) { GetShapeExport()->ExportGraphicDefaults(); @@ -1773,7 +1773,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) if (xCellStyles.is()) { sal_Int32 nCount(xCellStyles->getCount()); - OUString sNumberFormat(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); + OUString sNumberFormat(SC_UNONAME_NUMFMT); for (sal_Int32 i = 0; i < nCount; ++i) { uno::Reference <beans::XPropertySet> xCellProperties(xCellStyles->getByIndex(i), uno::UNO_QUERY); @@ -1791,7 +1791,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) exportDataStyles(); aStylesExp.exportStyleFamily(OUString("CellStyles"), - OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper, false, XML_STYLE_FAMILY_TABLE_CELL); + OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME), xCellStylesExportPropertySetMapper, false, XML_STYLE_FAMILY_TABLE_CELL); SvXMLExport::_ExportStyles(bUsed); } @@ -1803,8 +1803,8 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x //! pass xCellRanges instead uno::Reference<sheet::XSheetCellRanges> xCellRanges( xProperties, uno::UNO_QUERY ); - OUString SC_SCELLPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)); - OUString SC_NUMBERFORMAT(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); + OUString SC_SCELLPREFIX(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX); + OUString SC_NUMBERFORMAT(SC_UNONAME_NUMFMT); OUString sStyleName; sal_Int32 nNumberFormat(-1); @@ -1939,7 +1939,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>& xColumnProperties, const OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible) { - OUString SC_SCOLUMNPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX)); + OUString SC_SCOLUMNPREFIX(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX); std::vector<XMLPropertyState> xPropStates(xColumnStylesExportPropertySetMapper->Filter(xColumnProperties)); if(!xPropStates.empty()) @@ -1984,7 +1984,7 @@ void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>& void ScXMLExport::AddStyleFromRow(const uno::Reference<beans::XPropertySet>& xRowProperties, const OUString* pOldName, sal_Int32& rIndex) { - OUString SC_SROWPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX)); + OUString SC_SROWPREFIX(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX); std::vector<XMLPropertyState> xPropStates(xRowStylesExportPropertySetMapper->Filter(xRowProperties)); if(!xPropStates.empty()) @@ -3134,7 +3134,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, { uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); if ( xProps.is() ) - xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) >>= sHlink; + xProps->getPropertyValue( OUString( SC_UNONAME_HYPERLINK ) ) >>= sHlink; } catch ( const beans::UnknownPropertyException& ) { @@ -3532,19 +3532,19 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads uno::Reference<beans::XPropertySet> xPropertySet(xSpreadDoc, uno::UNO_QUERY); if (xPropertySet.is()) { - bool bCalcAsShown (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN))) )); - bool bIgnoreCase (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE))) )); - bool bLookUpLabels (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS))) )); - bool bMatchWholeCell (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE))) )); - bool bUseRegularExpressions (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED))) )); - bool bIsIterationEnabled (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED))) )); + bool bCalcAsShown (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(SC_UNO_CALCASSHOWN)) )); + bool bIgnoreCase (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(SC_UNO_IGNORECASE)) )); + bool bLookUpLabels (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(SC_UNO_LOOKUPLABELS)) )); + bool bMatchWholeCell (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(SC_UNO_MATCHWHOLE)) )); + bool bUseRegularExpressions (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(SC_UNO_REGEXENABLED)) )); + bool bIsIterationEnabled (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(SC_UNO_ITERENABLED)) )); sal_uInt16 nYear2000 (pDoc ? pDoc->GetDocOptions().GetYear2000() : 0); sal_Int32 nIterationCount(100); - xPropertySet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT))) >>= nIterationCount; + xPropertySet->getPropertyValue( OUString(SC_UNO_ITERCOUNT)) >>= nIterationCount; double fIterationEpsilon = 0; - xPropertySet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON))) >>= fIterationEpsilon; + xPropertySet->getPropertyValue( OUString(SC_UNO_ITEREPSILON)) >>= fIterationEpsilon; util::Date aNullDate; - xPropertySet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE))) >>= aNullDate; + xPropertySet->getPropertyValue( OUString(SC_UNO_NULLDATE)) >>= aNullDate; if (bCalcAsShown || bIgnoreCase || !bLookUpLabels || !bMatchWholeCell || !bUseRegularExpressions || bIsIterationEnabled || nIterationCount != 100 || !::rtl::math::approxEqual(fIterationEpsilon, 0.001) || aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899 || nYear2000 != 1930) @@ -3610,7 +3610,7 @@ void ScXMLExport::WriteTableSource() uno::Reference <beans::XPropertySet> xProps (GetModel(), uno::UNO_QUERY); if (xProps.is()) { - uno::Reference <container::XIndexAccess> xIndex(xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHEETLINKS))), uno::UNO_QUERY); + uno::Reference <container::XIndexAccess> xIndex(xProps->getPropertyValue(OUString(SC_UNO_SHEETLINKS)), uno::UNO_QUERY); if (xIndex.is()) { sal_Int32 nCount(xIndex->getCount()); @@ -3624,7 +3624,7 @@ void ScXMLExport::WriteTableSource() if (xLinkProps.is()) { OUString sNewLink; - if (xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_LINKURL))) >>= sNewLink) + if (xLinkProps->getPropertyValue(OUString(SC_UNONAME_LINKURL)) >>= sNewLink) bFound = sLink.equals(sNewLink); } } @@ -3634,9 +3634,9 @@ void ScXMLExport::WriteTableSource() OUString sFilterOptions; OUString sTableName (xLinkable->getLinkSheetName()); sal_Int32 nRefresh(0); - xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTER))) >>= sFilter; - xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTOPT))) >>= sFilterOptions; - xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_REFDELAY))) >>= nRefresh; + xLinkProps->getPropertyValue(OUString(SC_UNONAME_FILTER)) >>= sFilter; + xLinkProps->getPropertyValue(OUString(SC_UNONAME_FILTOPT)) >>= sFilterOptions; + xLinkProps->getPropertyValue(OUString(SC_UNONAME_REFDELAY)) >>= nRefresh; if (!sLink.isEmpty()) { AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE); @@ -3707,11 +3707,11 @@ void ScXMLExport::WriteTheLabelRanges( const uno::Reference< sheet::XSpreadsheet if( !xDocProp.is() ) return; sal_Int32 nCount(0); - uno::Reference< container::XIndexAccess > xColRangesIAccess(xDocProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLLABELRNG ) ) ), uno::UNO_QUERY); + uno::Reference< container::XIndexAccess > xColRangesIAccess(xDocProp->getPropertyValue( OUString( SC_UNO_COLLABELRNG ) ), uno::UNO_QUERY); if( xColRangesIAccess.is() ) nCount += xColRangesIAccess->getCount(); - uno::Reference< container::XIndexAccess > xRowRangesIAccess(xDocProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ROWLABELRNG ) ) ), uno::UNO_QUERY); + uno::Reference< container::XIndexAccess > xRowRangesIAccess(xDocProp->getPropertyValue( OUString( SC_UNO_ROWLABELRNG ) ), uno::UNO_QUERY); if( xRowRangesIAccess.is() ) nCount += xRowRangesIAccess->getCount(); diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 8a3bda1c8ab6..d1e5e47fc394 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -1946,11 +1946,11 @@ ScXMLImport::ScXMLImport( pDoc( NULL ), pChangeTrackingImportHelper(NULL), pStylesImportHelper(NULL), - sNumberFormat(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)), - sLocale(RTL_CONSTASCII_USTRINGPARAM(SC_LOCALE)), - sCellStyle(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLSTYL)), - sStandardFormat(RTL_CONSTASCII_USTRINGPARAM(SC_STANDARDFORMAT)), - sType(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_TYPE)), + sNumberFormat(SC_UNONAME_NUMFMT), + sLocale(SC_LOCALE), + sCellStyle(SC_UNONAME_CELLSTYL), + sStandardFormat(SC_STANDARDFORMAT), + sType(SC_UNONAME_TYPE), pDocElemTokenMap( 0 ), pStylesElemTokenMap( 0 ), pStylesAttrTokenMap( 0 ), @@ -2660,7 +2660,7 @@ bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString if (xNumberPropertySet.is()) { OUString sTemp; - if ( xNumberPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURRENCYSYMBOL))) >>= sTemp) + if ( xNumberPropertySet->getPropertyValue(OUString(SC_CURRENCYSYMBOL)) >>= sTemp) { if (sCurrentCurrency.equals(sTemp)) return true; @@ -2974,7 +2974,7 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE if (xPropertySetInfo.is()) { OUString const sOrganizerMode( - RTL_CONSTASCII_USTRINGPARAM("OrganizerMode")); + "OrganizerMode"); if (xPropertySetInfo->hasPropertyByName(sOrganizerMode)) { sal_Bool bStyleOnly(sal_False); @@ -3022,8 +3022,8 @@ void ScXMLImport::SetLabelRanges() uno::Reference <beans::XPropertySet> xPropertySet (GetModel(), uno::UNO_QUERY); if (xPropertySet.is()) { - uno::Any aColAny = xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COLLABELRNG))); - uno::Any aRowAny = xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ROWLABELRNG))); + uno::Any aColAny = xPropertySet->getPropertyValue(OUString(SC_UNO_COLLABELRNG)); + uno::Any aRowAny = xPropertySet->getPropertyValue(OUString(SC_UNO_ROWLABELRNG)); uno::Reference< sheet::XLabelRanges > xColRanges; uno::Reference< sheet::XLabelRanges > xRowRanges; @@ -3067,7 +3067,7 @@ class NamedRangesSwitch { public: NamedRangesSwitch(Reference<beans::XPropertySet>& xPropSet) : - mxPropSet(xPropSet), maPropName(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MODIFY_BROADCAST)) + mxPropSet(xPropSet), maPropName(SC_UNO_MODIFY_BROADCAST) { uno::Any any; any <<= false; diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index d1c1b4fec3a2..3fa6142091b3 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -204,9 +204,9 @@ void ScXMLTableRowContext::EndElement() bFiltered = true; } if (!bVisible) - xRowProperties->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISVISIBLE)), uno::makeAny(bVisible)); + xRowProperties->setPropertyValue(OUString(SC_ISVISIBLE), uno::makeAny(bVisible)); if (bFiltered) - xRowProperties->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISFILTERED)), uno::makeAny(bFiltered)); + xRowProperties->setPropertyValue(OUString(SC_ISFILTERED), uno::makeAny(bFiltered)); } } } diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index 129b87f38ad7..e87ba2387137 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.cxx @@ -139,31 +139,31 @@ void ScXMLSortContext::EndElement() if (nAlgoLength) ++i; uno::Sequence <beans::PropertyValue> aSortDescriptor(7 + i); - aSortDescriptor[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT)); + aSortDescriptor[0].Name = OUString(SC_UNONAME_BINDFMT); aSortDescriptor[0].Value = ::cppu::bool2any(bBindFormatsToContent); - aSortDescriptor[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COPYOUT)); + aSortDescriptor[1].Name = OUString(SC_UNONAME_COPYOUT); aSortDescriptor[1].Value = ::cppu::bool2any(bCopyOutputData); - aSortDescriptor[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE)); + aSortDescriptor[2].Name = OUString(SC_UNONAME_ISCASE); aSortDescriptor[2].Value = ::cppu::bool2any(bIsCaseSensitive); - aSortDescriptor[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISULIST)); + aSortDescriptor[3].Name = OUString(SC_UNONAME_ISULIST); aSortDescriptor[3].Value = ::cppu::bool2any(bEnabledUserList); - aSortDescriptor[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_OUTPOS)); + aSortDescriptor[4].Name = OUString(SC_UNONAME_OUTPOS); aSortDescriptor[4].Value <<= aOutputPosition; - aSortDescriptor[5].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_UINDEX)); + aSortDescriptor[5].Name = OUString(SC_UNONAME_UINDEX); aSortDescriptor[5].Value <<= nUserListIndex; - aSortDescriptor[6].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SORTFLD)); + aSortDescriptor[6].Name = OUString(SC_UNONAME_SORTFLD); aSortDescriptor[6].Value <<= aSortFields; if (nLangLength || nCountryLength) { lang::Locale aLocale; aLocale.Language = sLanguage; aLocale.Country = sCountry; - aSortDescriptor[7].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLLOC)); + aSortDescriptor[7].Name = OUString(SC_UNONAME_COLLLOC); aSortDescriptor[7].Value <<= aLocale; } if (nAlgoLength) { - aSortDescriptor[6 + i].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLALG)); + aSortDescriptor[6 + i].Name = OUString(SC_UNONAME_COLLALG); aSortDescriptor[6 + i].Value <<= sAlgorithm; } pDatabaseRangeContext->SetSortSequence(aSortDescriptor); diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index a331b0a2926a..6b4d8a1a154f 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -715,7 +715,7 @@ void ScXMLAutoStylePoolP::exportStyleContent( { OUString sCondition("is-true-formula("); sCondition += xSheetCondition->getFormula1(); - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(")"); rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_CONDITION, sCondition); rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_APPLY_STYLE_NAME, rScXMLExport.EncodeStyleName( sStyleName )); OUString sOUBaseAddress; @@ -738,11 +738,11 @@ void ScXMLAutoStylePoolP::exportStyleContent( sCondition += xSheetCondition->getFormula1(); sCondition += OUString(","); sCondition += xSheetCondition->getFormula2(); - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(")"); } else { - sCondition = OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); + sCondition = OUString("cell-content()"); switch (aOperator) { case sheet::ConditionOperator_LESS: diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 7e024b7901b7..477f151cbba6 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -710,9 +710,9 @@ XMLTableStylesContext::XMLTableStylesContext( SvXMLImport& rImport, const bool bTempAutoStyles ) : SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ), sCellStyleServiceName( OUString( "com.sun.star.style.CellStyle" )), - sColumnStyleServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), - sRowStyleServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))), - sTableStyleServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))), + sColumnStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME )), + sRowStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME )), + sTableStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME )), nNumberFormatIndex(-1), nConditionalFormatIndex(-1), nCellStyleIndex(-1), @@ -1052,9 +1052,9 @@ void ScMasterPageContext::Finish( sal_Bool bOverwrite ) { XMLTextMasterPageContext::Finish(bOverwrite); if (!bContainsRightFooter) - ClearContent(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTFTRCON))); + ClearContent(OUString(SC_UNO_PAGE_RIGHTFTRCON)); if (!bContainsRightHeader) - ClearContent(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON))); + ClearContent(OUString(SC_UNO_PAGE_RIGHTHDRCON)); } // --------------------------------------------------------------------------- diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 7ba722d77061..0dcaf5ee9452 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -420,7 +420,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) if (bStylesOnly) { OUString const sOrganizerMode( - RTL_CONSTASCII_USTRINGPARAM("OrganizerMode")); + "OrganizerMode"); xInfoSet->setPropertyValue(sOrganizerMode, uno::makeAny(sal_True)); } diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 831386a88e04..39e70a03ffad 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -113,7 +113,7 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getForeground() uno::Reference<beans::XPropertySet> xCellProps(xCell, uno::UNO_QUERY); if (xCellProps.is()) { - uno::Any aAny = xCellProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CCOLOR))); + uno::Any aAny = xCellProps->getPropertyValue(OUString(SC_UNONAME_CCOLOR)); aAny >>= nColor; } } @@ -154,7 +154,7 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getBackground() uno::Reference<beans::XPropertySet> xCellProps(xCell, uno::UNO_QUERY); if (xCellProps.is()) { - uno::Any aAny = xCellProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLBACK))); + uno::Any aAny = xCellProps->getPropertyValue(OUString(SC_UNONAME_CELLBACK)); aAny >>= nColor; } } diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index d22416ee542d..eec20b57ae7c 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -91,8 +91,8 @@ struct ScShapeDataLess OUString msLayerId; OUString msZOrder; ScShapeDataLess() - : msLayerId(RTL_CONSTASCII_USTRINGPARAM( "LayerID" )), - msZOrder(RTL_CONSTASCII_USTRINGPARAM( "ZOrder" )) + : msLayerId( "LayerID" ), + msZOrder( "ZOrder" ) { } void ConvertLayerId(sal_Int16& rLayerID) const // changes the number of the LayerId so it the accessibility order diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 7f6ac08c6f95..e06b4c8962d5 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2759,7 +2759,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) if (!aReplace.equalsAsciiL("\"", 1)) aString = aString.replaceAll( aReplace, - OUString(RTL_CONSTASCII_USTRINGPARAM("\""))); + OUString("\"")); aReplace = OUString(pAuto->GetEndDoubleQuote()); if (aReplace.isEmpty()) @@ -2767,7 +2767,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) if (!aReplace.equalsAsciiL("\"", 1)) aString = aString.replaceAll( aReplace, - OUString(RTL_CONSTASCII_USTRINGPARAM("\""))); + OUString("\"")); aReplace = OUString(pAuto->GetStartSingleQuote()); if (aReplace.isEmpty()) diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 311fab420650..a24296c7666a 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2098,7 +2098,7 @@ OUString createLocalRangeName(const OUString& rName, const OUString& rTableName) OUStringBuffer aString (rName); aString.append(OUString(" (")); aString.append(rTableName); - aString.append(OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + aString.append(OUString(")")); return aString.makeStringAndClear(); } diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx index 425a868b7e11..0a02cc6adeba 100644 --- a/sc/source/ui/app/scmod2.cxx +++ b/sc/source/ui/app/scmod2.cxx @@ -59,7 +59,7 @@ void ScModule::SetAutoSpellProperty( sal_Bool bSet ) uno::Any aAny; aAny <<= bSet; - aConfig.SetProperty( OUString(RTL_CONSTASCII_USTRINGPARAM( LINGUPROP_AUTOSPELL )), aAny ); + aConfig.SetProperty( OUString( LINGUPROP_AUTOSPELL ), aAny ); } diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 3d33e800e2a9..e32c03d75973 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -76,7 +76,7 @@ ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sa PopupMenuFloatingWindow(pParent), maOpenTimer(this), maCloseTimer(this), - maName(RTL_CONSTASCII_USTRINGPARAM("ScMenuFloatingWindow")), + maName("ScMenuFloatingWindow"), mnSelectedMenu(MENU_NOT_SELECTED), mnClickedMenu(MENU_NOT_SELECTED), mpDoc(pDoc), diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index 974225d4bf91..7267a41a8050 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -48,9 +48,9 @@ static void load_FixedWidthList(ScCsvSplits &aSplits) const Any *pProperties; Sequence<OUString> aNames(1); OUString* pNames = aNames.getArray(); - ScLinkConfigItem aItem( OUString(RTL_CONSTASCII_USTRINGPARAM( SEP_PATH )) ); + ScLinkConfigItem aItem( OUString( SEP_PATH ) ); - pNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( FIXED_WIDTH_LIST )); + pNames[0] = OUString( FIXED_WIDTH_LIST ); aValues = aItem.GetProperties( aNames ); pProperties = aValues.getConstArray(); @@ -83,9 +83,9 @@ static void save_FixedWidthList(ScCsvSplits aSplits) Any *pProperties; Sequence<OUString> aNames(1); OUString* pNames = aNames.getArray(); - ScLinkConfigItem aItem( OUString(RTL_CONSTASCII_USTRINGPARAM( SEP_PATH )) ); + ScLinkConfigItem aItem( OUString( SEP_PATH ) ); - pNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( FIXED_WIDTH_LIST )); + pNames[0] = OUString( FIXED_WIDTH_LIST ); aValues = aItem.GetProperties( aNames ); pProperties = aValues.getArray(); pProperties[0] <<= sFixedWidthLists; diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index 55b71790559c..5d31d1da530f 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -126,7 +126,7 @@ void ScFilterOptionsMgr::Init() pViewData->GetTabNo() ) ); ScDBCollection* pDBColl = pDoc->GetDBCollection(); OUStringBuffer theDbArea; - OUString theDbName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + OUString theDbName(STR_DB_LOCAL_NONAME); const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); theCurArea.Format( theAreaStr, SCR_ABS_3D, pDoc, eConv ); diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 58ba39f4890e..3f5f63e899a1 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -161,7 +161,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) theQueryData.nRow2, nSrcTab ) ); ScDBCollection* pDBColl = pDoc->GetDBCollection(); - OUString theDbName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + OUString theDbName = OUString(STR_DB_LOCAL_NONAME); /* * Ueberpruefen, ob es sich bei dem uebergebenen diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index e6ff9c0ff5bb..07d063a6f25d 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -129,17 +129,17 @@ static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparato } ScLinkConfigItem aItem( aSepPath ); - pNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( MERGE_DELIMITERS )); - pNames[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATORS )); - pNames[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( TEXT_SEPARATORS )); - pNames[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( FIXED_WIDTH )); + pNames[0] = OUString( MERGE_DELIMITERS ); + pNames[1] = OUString( SEPARATORS ); + pNames[2] = OUString( TEXT_SEPARATORS ); + pNames[3] = OUString( FIXED_WIDTH ); if (eCall != SC_TEXTTOCOLUMNS) { - pNames[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( FROM_ROW )); - pNames[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( CHAR_SET )); - pNames[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( QUOTED_AS_TEXT )); - pNames[7] = OUString(RTL_CONSTASCII_USTRINGPARAM( DETECT_SPECIAL_NUM )); - pNames[8] = OUString(RTL_CONSTASCII_USTRINGPARAM( LANGUAGE )); + pNames[4] = OUString( FROM_ROW ); + pNames[5] = OUString( CHAR_SET ); + pNames[6] = OUString( QUOTED_AS_TEXT ); + pNames[7] = OUString( DETECT_SPECIAL_NUM ); + pNames[8] = OUString( LANGUAGE ); } aValues = aItem.GetProperties( aNames ); pProperties = aValues.getConstArray(); @@ -202,17 +202,17 @@ static void save_Separators( } ScLinkConfigItem aItem( aSepPath ); - pNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( MERGE_DELIMITERS )); - pNames[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATORS )); - pNames[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( TEXT_SEPARATORS )); - pNames[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( FIXED_WIDTH )); + pNames[0] = OUString( MERGE_DELIMITERS ); + pNames[1] = OUString( SEPARATORS ); + pNames[2] = OUString( TEXT_SEPARATORS ); + pNames[3] = OUString( FIXED_WIDTH ); if (eCall != SC_TEXTTOCOLUMNS) { - pNames[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( FROM_ROW )); - pNames[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( CHAR_SET )); - pNames[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( QUOTED_AS_TEXT )); - pNames[7] = OUString(RTL_CONSTASCII_USTRINGPARAM( DETECT_SPECIAL_NUM )); - pNames[8] = OUString(RTL_CONSTASCII_USTRINGPARAM( LANGUAGE )); + pNames[4] = OUString( FROM_ROW ); + pNames[5] = OUString( CHAR_SET ); + pNames[6] = OUString( QUOTED_AS_TEXT ); + pNames[7] = OUString( DETECT_SPECIAL_NUM ); + pNames[8] = OUString( LANGUAGE ); } aValues = aItem.GetProperties( aNames ); pProperties = aValues.getArray(); diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index fd62073aa6ab..4499600e1f2d 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -596,7 +596,7 @@ void ScTabPageSortOptions::Init() String theArea; ScDBCollection* pDBColl = pDoc->GetDBCollection(); const SCTAB nCurTab = pViewData->GetTabNo(); - OUString theDbName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + OUString theDbName = OUString(STR_DB_LOCAL_NONAME); const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); m_pLbOutPos->Clear(); diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index a54b1f0b232d..f299c69c1e49 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -211,7 +211,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, bDispose = sal_True; xRowSet = uno::Reference<sdbc::XRowSet>( comphelper::getProcessServiceFactory()->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), + OUString( SC_SERVICE_ROWSET ) ), uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY ); OSL_ENSURE( xRowProp.is(), "can't get RowSet" ); @@ -228,15 +228,15 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, aAny <<= rParam.aDBName; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_DATASOURCENAME)), aAny ); + OUString(SC_DBPROP_DATASOURCENAME), aAny ); aAny <<= rParam.aStatement; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); + OUString(SC_DBPROP_COMMAND), aAny ); aAny <<= nType; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); + OUString(SC_DBPROP_COMMANDTYPE), aAny ); uno::Reference<sdb::XCompletedExecution> xExecute( xRowSet, uno::UNO_QUERY ); if ( xExecute.is() ) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index c99ca76ef4ab..4c5fcdc810a4 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -429,7 +429,7 @@ sal_Bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::un bRet = aImport.Import(sal_True, nError); if ( nError ) - pLoadMedium->SetError( nError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + pLoadMedium->SetError( nError, OUString( OSL_LOG_PREFIX ) ); //if the document was not generated by LibreOffice, do hard recalc in case some other document //generator saved cached formula results that differ from LibreOffice's calculated results or @@ -561,10 +561,10 @@ sal_Bool ScDocShell::Load( SfxMedium& rMedium ) } if (!bRet && !rMedium.GetError()) - rMedium.SetError( SVSTREAM_FILEFORMAT_ERROR, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + rMedium.SetError( SVSTREAM_FILEFORMAT_ERROR, OUString( OSL_LOG_PREFIX ) ); if (rMedium.GetError()) - SetError( rMedium.GetError(), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( rMedium.GetError(), OUString( OSL_LOG_PREFIX ) ); InitItems(); CalcOutputFactor(); @@ -904,7 +904,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) } if ( !bSuccess ) - SetError( ERRCODE_IO_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // this error code will produce no error message, but will break the further saving process + SetError( ERRCODE_IO_ABORT, OUString( OSL_LOG_PREFIX ) ); // this error code will produce no error message, but will break the further saving process } #endif @@ -921,7 +921,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if( RET_NO == aBox.Execute()) { - SetError( ERRCODE_IO_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // this error code will produce no error message, but will break the further saving process + SetError( ERRCODE_IO_ABORT, OUString( OSL_LOG_PREFIX ) ); // this error code will produce no error message, but will break the further saving process } } } // fall through @@ -1062,7 +1062,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); } else bRet = sal_True; @@ -1091,7 +1091,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1128,13 +1128,13 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError == SCWARN_IMPORT_RANGE_OVERFLOW) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); bRet = sal_True; } else if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); } else bRet = true; @@ -1194,7 +1194,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); } else if (!GetError() && (bOverflowRow || bOverflowCol || bOverflowCell)) { @@ -1202,7 +1202,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) FltError nWarn = (bOverflowRow ? SCWARN_IMPORT_ROW_OVERFLOW : (bOverflowCol ? SCWARN_IMPORT_COLUMN_OVERFLOW : SCWARN_IMPORT_CELL_OVERFLOW)); - SetError( nWarn, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError( nWarn, OUString( OSL_LOG_PREFIX )); } bSetColWidths = sal_True; bSetSimpleTextColWidths = sal_True; @@ -1234,7 +1234,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); bRet = ( eError == SCWARN_IMPORT_RANGE_OVERFLOW ); } else @@ -1272,7 +1272,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1307,7 +1307,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) } if ( eError != eERR_OK && !GetError() ) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); bSetColWidths = sal_True; bSetSimpleTextColWidths = sal_True; bSetRowHeights = sal_True; @@ -1318,7 +1318,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError( eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( eError, OUString( OSL_LOG_PREFIX ) ); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; } @@ -1344,7 +1344,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1363,7 +1363,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) } if ( eError != eERR_OK && !GetError() ) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); } else if (aFltName.EqualsAscii(pFilterHtml) || aFltName.EqualsAscii(pFilterHtmlWebQ)) { @@ -1395,7 +1395,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1412,12 +1412,12 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) } if ( eError != eERR_OK && !GetError() ) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); } else { if (!GetError()) - SetError(SCERR_IMPORT_NI, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(SCERR_IMPORT_NI, OUString( OSL_LOG_PREFIX )); } if (!bCalc3) @@ -2228,7 +2228,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) FltError eError = ScFormatFilter::Get().ScExportExcel5( rMed, &aDocument, eFormat, RTL_TEXTENCODING_MS_1252 ); if( eError && !GetError() ) - SetError( eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( eError, OUString( OSL_LOG_PREFIX ) ); // don't return false for warnings bRet = ((eError & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK) || (eError == eERR_OK); @@ -2236,7 +2236,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) else { // export aborted, i.e. "Save without password" warning - SetError( ERRCODE_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( ERRCODE_ABORT, OUString( OSL_LOG_PREFIX ) ); } } else if (aFltName.EqualsAscii(pFilterAscii)) @@ -2269,7 +2269,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) if (aDocument.GetTableCount() > 1) if (!rMed.GetError()) - rMed.SetError(SCWARN_EXPORT_ASCII, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + rMed.SetError(SCWARN_EXPORT_ASCII, OUString( OSL_LOG_PREFIX )); } } else if (aFltName.EqualsAscii(pFilterDBase)) @@ -2310,7 +2310,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) if ( eError != eERR_OK ) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); if ( bHasMemo && IsDocument( aTmpFile ) ) KillFile( aTmpFile ); } @@ -2331,7 +2331,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) { KillFile( aTmpFile ); if ( !GetError() ) - SetError( SCERR_EXPORT_DATA, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( SCERR_EXPORT_DATA, OUString( OSL_LOG_PREFIX ) ); } } } @@ -2365,7 +2365,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) if (aDocument.GetTableCount() > 1) if (!rMed.GetError()) - rMed.SetError(SCWARN_EXPORT_ASCII, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + rMed.SetError(SCWARN_EXPORT_ASCII, OUString( OSL_LOG_PREFIX )); } } else if (aFltName.EqualsAscii(pFilterSylk)) @@ -2398,13 +2398,13 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) SetError( *new StringErrorInfo( SCWARN_EXPORT_NONCONVERTIBLE_CHARS, aImExport.GetNonConvertibleChars(), - ERRCODE_BUTTON_OK | ERRCODE_MSG_INFO ), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + ERRCODE_BUTTON_OK | ERRCODE_MSG_INFO ), OUString( OSL_LOG_PREFIX ) ); } } else { if (GetError()) - SetError(SCERR_IMPORT_NI, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError(SCERR_IMPORT_NI, OUString( OSL_LOG_PREFIX ) ); } return bRet; } diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 2a18ea8fb652..d324df53ab2b 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -277,7 +277,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe } else { - aNewName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + aNewName = OUString(STR_DB_LOCAL_NONAME); pNoNameData = new ScDBData(aNewName , nTab, nStartCol,nStartRow, nEndCol,nEndRow, sal_True, bHasHeader ); diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 58ac3640122b..a0bd1d99d326 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -141,9 +141,9 @@ namespace } uno::Sequence<beans::PropertyValue> aProps(2); - aProps[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_EXTENSION)); + aProps[0].Name = OUString(SC_DBPROP_EXTENSION); aProps[0].Value <<= OUString( aExtension ); - aProps[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_CHARSET)); + aProps[1].Name = OUString(SC_DBPROP_CHARSET); aProps[1].Value <<= aCharSetStr; _rConnection = _rDrvMgr->getConnectionWithInfo( aConnUrl, aProps ); @@ -325,7 +325,7 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet ScProgress aProgress( this, ScGlobal::GetRscString( STR_LOAD_DOC ), 0 ); uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory(); uno::Reference<sdbc::XRowSet> xRowSet( xFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), + OUString( SC_SERVICE_ROWSET ) ), uno::UNO_QUERY); ::utl::DisposableComponent aRowSetHelper(xRowSet); uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY ); @@ -337,19 +337,19 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet aAny <<= xConnection; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_ACTIVECONNECTION)), aAny ); + OUString(SC_DBPROP_ACTIVECONNECTION), aAny ); aAny <<= nType; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); + OUString(SC_DBPROP_COMMANDTYPE), aAny ); aAny <<= OUString( aTabName ); xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); + OUString(SC_DBPROP_COMMAND), aAny ); aAny <<= false; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_PROPCHANGE_NOTIFY)), aAny ); + OUString(SC_DBPROP_PROPCHANGE_NOTIFY), aAny ); xRowSet->execute(); @@ -874,7 +874,7 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, CharSet eCharS if (!xTableDesc.is()) return SCERR_EXPORT_CONNECT; aAny <<= OUString( aTabName ); - xTableDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_NAME)), aAny ); + xTableDesc->setPropertyValue( OUString(SC_DBPROP_NAME), aAny ); // create columns @@ -907,16 +907,16 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, CharSet eCharS if (!xColumnDesc.is()) return SCERR_EXPORT_CONNECT; aAny <<= pColNames[nCol]; - xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_NAME)), aAny ); + xColumnDesc->setPropertyValue( OUString(SC_DBPROP_NAME), aAny ); aAny <<= pColTypes[nCol]; - xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_TYPE)), aAny ); + xColumnDesc->setPropertyValue( OUString(SC_DBPROP_TYPE), aAny ); aAny <<= pColLengths[nCol]; - xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_PRECISION)), aAny ); + xColumnDesc->setPropertyValue( OUString(SC_DBPROP_PRECISION), aAny ); aAny <<= pColScales[nCol]; - xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_SCALE)), aAny ); + xColumnDesc->setPropertyValue( OUString(SC_DBPROP_SCALE), aAny ); xColumnsAppend->appendByDescriptor( xColumnDesc ); } @@ -926,7 +926,7 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, CharSet eCharS // get row set for writing uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory(); uno::Reference<sdbc::XRowSet> xRowSet( xFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), + OUString( SC_SERVICE_ROWSET ) ), uno::UNO_QUERY); ::utl::DisposableComponent aRowSetHelper(xRowSet); uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY ); @@ -935,15 +935,15 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, CharSet eCharS aAny <<= xConnection; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_ACTIVECONNECTION)), aAny ); + OUString(SC_DBPROP_ACTIVECONNECTION), aAny ); aAny <<= (sal_Int32) sdb::CommandType::TABLE; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); + OUString(SC_DBPROP_COMMANDTYPE), aAny ); aAny <<= OUString( aTabName ); xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); + OUString(SC_DBPROP_COMMAND), aAny ); xRowSet->execute(); diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 84413a5e61ee..6b04dc3435b9 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -100,7 +100,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, pDoc = pViewData->GetDocument(); m_xParser.set(ScServiceProvider::MakeInstance(SC_SERVICE_FORMULAPARS,(ScDocShell*)pDoc->GetDocumentShell()),uno::UNO_QUERY); uno::Reference< beans::XPropertySet> xSet(m_xParser,uno::UNO_QUERY); - xSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COMPILEFAP)),uno::makeAny(sal_True)); + xSet->setPropertyValue(OUString(SC_UNO_COMPILEFAP),uno::makeAny(sal_True)); m_xOpCodeMapper.set(ScServiceProvider::MakeInstance(SC_SERVICE_OPCODEMAPPER,(ScDocShell*)pDoc->GetDocumentShell()),uno::UNO_QUERY); diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 0912abb57298..45809091a11b 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -105,7 +105,7 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pPa aStrChildContent (SC_RESSTR(STR_CHG_CHILD_CONTENT)), aStrChildOrgContent (SC_RESSTR(STR_CHG_CHILD_ORGCONTENT)), aStrEmpty (SC_RESSTR(STR_CHG_EMPTY)), - aUnknown(RTL_CONSTASCII_USTRINGPARAM("Unknown")), + aUnknown("Unknown"), bAcceptEnableFlag(true), bRejectEnableFlag(true), bNeedsUpdate(false), diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index c88bbf7f3477..284471cab820 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -118,7 +118,7 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl) // #i53241# replace HTML filter with DataQuery filter if (aFilter.equalsAscii(FILTERNAME_HTML)) - aFilter = OUString(RTL_CONSTASCII_USTRINGPARAM(FILTERNAME_QUERY)); + aFilter = OUString(FILTERNAME_QUERY); LoadDocument( aEntered, aFilter, aOptions ); @@ -213,8 +213,8 @@ IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg WaitObject aWait( this ); // replace HTML filter with DataQuery filter - const OUString aHTMLFilterName( RTL_CONSTASCII_USTRINGPARAM( FILTERNAME_HTML ) ); - const OUString aWebQFilterName( RTL_CONSTASCII_USTRINGPARAM( FILTERNAME_QUERY ) ); + const OUString aHTMLFilterName( FILTERNAME_HTML ); + const OUString aWebQFilterName( FILTERNAME_QUERY ); const SfxFilter* pFilter = pMed->GetFilter(); if (pFilter && aHTMLFilterName.equals(pFilter->GetFilterName())) diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index 3adfd8edef1f..57dddbe7b751 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -85,7 +85,7 @@ void ScSolverUtil::GetImplementations( uno::Sequence<OUString>& rImplNames, if ( xEnAc.is() ) { uno::Reference<container::XEnumeration> xEnum = - xEnAc->createContentEnumeration( OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); + xEnAc->createContentEnumeration( OUString(SCSOLVER_SERVICE) ); if ( xEnum.is() ) { sal_Int32 nCount = 0; @@ -135,7 +135,7 @@ uno::Reference<sheet::XSolver> ScSolverUtil::GetSolver( const OUString& rImplNam if ( xEnAc.is() ) { uno::Reference<container::XEnumeration> xEnum = - xEnAc->createContentEnumeration( OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); + xEnAc->createContentEnumeration( OUString(SCSOLVER_SERVICE) ); if ( xEnum.is() ) { while ( xEnum->hasMoreElements() && !xSolver.is() ) diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index fbb3c3d3eb16..3804fcac27f4 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -129,7 +129,7 @@ bool ScNameDefDlg::IsNameValid() ScRangeName* pRangeName = NULL; if(aScope == maGlobalNameStr) { - pRangeName = maRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + pRangeName = maRangeMap.find(OUString(STR_GLOBAL_RANGE_NAME))->second; } else { @@ -188,7 +188,7 @@ void ScNameDefDlg::AddPushed() ScRangeName* pRangeName = NULL; if(aScope == maGlobalNameStr) { - pRangeName = maRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + pRangeName = maRangeMap.find(OUString(STR_GLOBAL_RANGE_NAME))->second; } else { diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 4b715aece319..d3718a05c270 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -303,7 +303,7 @@ bool ScNameDlg::IsFormulaValid() ScRangeName* ScNameDlg::GetRangeName(const OUString& rScope) { if (rScope == maGlobalNameStr) - return maRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + return maRangeMap.find(OUString(STR_GLOBAL_RANGE_NAME))->second; else return maRangeMap.find(rScope)->second; } diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index ad314cff8da8..b7305fc16b08 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -148,7 +148,7 @@ const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine& rLi { const ScRangeName* pRangeName; if (rLine.aScope == maGlobalString) - pRangeName = mrRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + pRangeName = mrRangeMap.find(OUString(STR_GLOBAL_RANGE_NAME))->second; else pRangeName = mrRangeMap.find(rLine.aScope)->second; diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 2f3f2d44f73f..0d3dfedfad06 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -645,7 +645,7 @@ OUString createLocalRangeName(const OUString& rName, const OUString& rTableName) OUStringBuffer aString (rName); aString.append(OUString(" (")); aString.append(rTableName); - aString.append(OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + aString.append(OUString(")")); return aString.makeStringAndClear(); } } diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx index e36813751ada..4071e8574d93 100644 --- a/sc/source/ui/undo/undoutil.cxx +++ b/sc/source/ui/undo/undoutil.cxx @@ -89,7 +89,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB pRet = pDoc->GetAnonymousDBData(nTab); if (!pRet) { - pRet = new ScDBData( OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)), nTab, + pRet = new ScDBData( OUString(STR_DB_LOCAL_NONAME), nTab, nCol1,nRow1, nCol2,nRow2, sal_True, pDoc->HasColHeader( nCol1,nRow1,nCol2,nRow2,nTab ) ); pDoc->SetAnonymousDBData(nTab,pRet); diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 4240c223fbec..4ebb1d2cbbf6 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -202,7 +202,7 @@ uno::Sequence<OUString> ScAutoFormatsObj::getSupportedServiceNames_Static() { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCAUTOFORMATSOBJ_SERVICE )); + pArray[0] = OUString( SCAUTOFORMATSOBJ_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 3135e9599fd2..07eb1156c484 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -374,7 +374,7 @@ uno::Sequence<OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static() { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEETSETTINGS_SERVICE )); + pArray[0] = OUString( SCSPREADSHEETSETTINGS_SERVICE ); return aRet; } @@ -636,7 +636,7 @@ uno::Sequence<OUString> ScRecentFunctionsObj::getSupportedServiceNames_Static() { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCRECENTFUNCTIONSOBJ_SERVICE )); + pArray[0] = OUString( SCRECENTFUNCTIONSOBJ_SERVICE ); return aRet; } @@ -717,7 +717,7 @@ uno::Sequence<OUString> ScFunctionListObj::getSupportedServiceNames_Static() { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONLISTOBJ_SERVICE )); + pArray[0] = OUString( SCFUNCTIONLISTOBJ_SERVICE ); return aRet; } @@ -730,21 +730,21 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co beans::PropertyValue* pArray = rSequence.getArray(); - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ID )); + pArray[0].Name = OUString( SC_UNONAME_ID ); pArray[0].Value <<= (sal_Int32) rDesc.nFIndex; - pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CATEGORY )); + pArray[1].Name = OUString( SC_UNONAME_CATEGORY ); pArray[1].Value <<= (sal_Int32) rDesc.nCategory; - pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_NAME )); + pArray[2].Name = OUString( SC_UNONAME_NAME ); if (rDesc.pFuncName) pArray[2].Value <<= OUString( *rDesc.pFuncName ); - pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DESCRIPTION )); + pArray[3].Name = OUString( SC_UNONAME_DESCRIPTION ); if (rDesc.pFuncDesc) pArray[3].Value <<= OUString( *rDesc.pFuncDesc ); - pArray[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ARGUMENTS )); + pArray[4].Name = OUString( SC_UNONAME_ARGUMENTS ); if (rDesc.ppDefArgNames && rDesc.ppDefArgDescs && rDesc.pDefArgFlags ) { sal_uInt16 nCount = rDesc.nArgCount; diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index dc4019301752..bb37ccfff29e 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -4823,10 +4823,10 @@ uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(4); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGES_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + pArray[0] = OUString( SCSHEETCELLRANGES_SERVICE ); + pArray[1] = OUString( SCCELLPROPERTIES_SERVICE ); + pArray[2] = OUString( SCCHARPROPERTIES_SERVICE ); + pArray[3] = OUString( SCPARAPROPERTIES_SERVICE ); return aRet; } @@ -6115,11 +6115,11 @@ uno::Sequence<OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(5); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); - pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + pArray[0] = OUString( SCSHEETCELLRANGE_SERVICE ); + pArray[1] = OUString( SCCELLRANGE_SERVICE ); + pArray[2] = OUString( SCCELLPROPERTIES_SERVICE ); + pArray[3] = OUString( SCCHARPROPERTIES_SERVICE ); + pArray[4] = OUString( SCPARAPROPERTIES_SERVICE ); return aRet; } @@ -6854,13 +6854,13 @@ uno::Sequence<OUString> SAL_CALL ScCellObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(7); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELL_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELL_SERVICE )); - pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); - pArray[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); - pArray[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); + pArray[0] = OUString( SCSHEETCELL_SERVICE ); + pArray[1] = OUString( SCCELL_SERVICE ); + pArray[2] = OUString( SCCELLPROPERTIES_SERVICE ); + pArray[3] = OUString( SCCHARPROPERTIES_SERVICE ); + pArray[4] = OUString( SCPARAPROPERTIES_SERVICE ); + pArray[5] = OUString( SCSHEETCELLRANGE_SERVICE ); + pArray[6] = OUString( SCCELLRANGE_SERVICE ); return aRet; } @@ -8769,13 +8769,13 @@ uno::Sequence<OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(7); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEET_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); - pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); - pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); - pArray[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); + pArray[0] = OUString( SCSPREADSHEET_SERVICE ); + pArray[1] = OUString( SCSHEETCELLRANGE_SERVICE ); + pArray[2] = OUString( SCCELLRANGE_SERVICE ); + pArray[3] = OUString( SCCELLPROPERTIES_SERVICE ); + pArray[4] = OUString( SCCHARPROPERTIES_SERVICE ); + pArray[5] = OUString( SCPARAPROPERTIES_SERVICE ); + pArray[6] = OUString( SCLINKTARGET_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index bfa5bd806598..4efb484410aa 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -458,7 +458,7 @@ namespace calc { OUString sMessage( "The given type (" ); sMessage += _rType.getTypeName(); - sMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( ") is not supported by this binding." ) ); + sMessage += OUString( ") is not supported by this binding." ); // TODO: localize this error message throw IncompatibleTypesException( sMessage, *pNonConstThis ); diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index d72a9c313165..a6aa3321b9b3 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -483,8 +483,8 @@ uno::Sequence<OUString> SAL_CALL ScDocumentConfiguration::getSupportedServiceNam { uno::Sequence<OUString> aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCOMPSCPREADSHEETSETTINGS_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCUMENTSETTINGS_SERVICE )); + pArray[0] = OUString( SCCOMPSCPREADSHEETSETTINGS_SERVICE ); + pArray[1] = OUString( SCDOCUMENTSETTINGS_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index d2c2f35e38ca..546d0fcfeaca 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -481,8 +481,8 @@ uno::Sequence<OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames() // SheetCellCursor should be first (?) uno::Sequence<OUString> aTotalSeq( nParentLen + 2 ); OUString* pTotalArr = aTotalSeq.getArray(); - pTotalArr[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLCURSOR_SERVICE )); - pTotalArr[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLCURSOR_SERVICE )); + pTotalArr[0] = OUString( SCSHEETCELLCURSOR_SERVICE ); + pTotalArr[1] = OUString( SCCELLCURSOR_SERVICE ); // append cell range services for (long i=0; i<nParentLen; i++) diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index bb6969e0b063..8e960e0d75bc 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -373,7 +373,7 @@ static bool lcl_IsDuplicated( const Reference<XPropertySet> xDimProps ) { try { - Any aAny = xDimProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_ORIGINAL ) ) ); + Any aAny = xDimProps->getPropertyValue( OUString( SC_UNO_DP_ORIGINAL ) ); Reference< XNamed > xOriginal( aAny, UNO_QUERY ); return xOriginal.is(); } @@ -392,7 +392,7 @@ static OUString lcl_GetOriginalName( const Reference< XNamed > xDim ) { try { - Any aAny = xDimProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIGINAL))); + Any aAny = xDimProps->getPropertyValue(OUString(SC_UNO_DP_ORIGINAL)); aAny >>= xOriginal; } catch( Exception& ) @@ -1001,13 +1001,13 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope { uno::Sequence<beans::PropertyValue> aSeq( 4 ); beans::PropertyValue* pArray = aSeq.getArray(); - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_SOURCENAME )); + pArray[0].Name = OUString( SC_UNO_DP_SOURCENAME ); pArray[0].Value <<= pServiceDesc->aParSource; - pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_OBJECTNAME )); + pArray[1].Name = OUString( SC_UNO_DP_OBJECTNAME ); pArray[1].Value <<= pServiceDesc->aParName; - pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_USERNAME )); + pArray[2].Name = OUString( SC_UNO_DP_USERNAME ); pArray[2].Value <<= pServiceDesc->aParUser; - pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_PASSWORD )); + pArray[3].Name = OUString( SC_UNO_DP_PASSWORD ); pArray[3].Value <<= pServiceDesc->aParPass; aRet <<= aSeq; } @@ -1061,7 +1061,7 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotDescriptorBase::getDataLayoutFi { if( pSaveData->GetDataLayoutDimension() ) { - ScFieldIdentifier aFieldId( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) ), 0, true ); + ScFieldIdentifier aFieldId( OUString( SC_DATALAYOUT_NAME ), 0, true ); return new ScDataPilotFieldObj( *this, aFieldId ); } } @@ -1593,7 +1593,7 @@ static sal_Int32 lcl_GetFieldCount( const Reference<XDimensionsSupplier>& rSourc for (sal_Int32 i = 0; i < nIntCount; ++i) { xDim.set(xIntDims->getByIndex(i), UNO_QUERY); - if (xDim.is() && (xDim->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION))) == rOrient)) + if (xDim.is() && (xDim->getPropertyValue(OUString(SC_UNO_DP_ORIENTATION)) == rOrient)) ++nRet; } } @@ -1633,7 +1633,7 @@ static sal_Bool lcl_GetFieldDataByIndex( const Reference<XDimensionsSupplier>& r while (i < nIntCount && !bOk) { xDim.set(xIntDims->getByIndex(i), UNO_QUERY); - if (xDim.is() && (xDim->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION))) == rOrient)) + if (xDim.is() && (xDim->getPropertyValue(OUString(SC_UNO_DP_ORIENTATION)) == rOrient)) { if (nPos == nIndex) { @@ -1675,7 +1675,7 @@ static sal_Bool lcl_GetFieldDataByIndex( const Reference<XDimensionsSupplier>& r OUString sOriginalName( lcl_GetOriginalName( xDimName ) ); rFieldId.maFieldName = sOriginalName; rFieldId.mbDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDim, - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)) ); + OUString(SC_UNO_DP_ISDATALAYOUT) ); sal_Int32 nRepeat = 0; if ( rOrient.hasValue() && lcl_IsDuplicated( xDim ) ) @@ -1853,7 +1853,7 @@ OUString SAL_CALL ScDataPilotFieldObj::getName() throw(RuntimeException) if( ScDPSaveDimension* pDim = GetDPDimension() ) { if( pDim->IsDataLayout() ) - aName = OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) ); + aName = OUString( SC_DATALAYOUT_NAME ); else { const OUString* pLayoutName = pDim->GetLayoutName(); @@ -3490,7 +3490,7 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName { Reference< XPropertySet > xMemberProps( xMember, UNO_QUERY ); if( xMemberProps.is() ) - aRet = xMemberProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_SHOWDETAILS ) ) ); + aRet = xMemberProps->getPropertyValue( OUString( SC_UNO_DP_SHOWDETAILS ) ); else aRet <<= true; } @@ -3505,7 +3505,7 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName { Reference< XPropertySet > xMemberProps( xMember, UNO_QUERY ); if( xMemberProps.is() ) - aRet <<= !cppu::any2bool( xMemberProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_ISVISIBLE ) ) ) ); + aRet <<= !cppu::any2bool( xMemberProps->getPropertyValue( OUString( SC_UNO_DP_ISVISIBLE ) ) ); else aRet <<= false; } diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index d41ffc85e052..079e97b5c002 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -217,22 +217,22 @@ void ScImportDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rS aDescriptor.setDataSource(rParam.aDBName); if (aDescriptor.has( svx::daDataSource )) { - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DBNAME )); + pArray[0].Name = OUString( SC_UNONAME_DBNAME ); pArray[0].Value <<= rParam.aDBName; } else if (aDescriptor.has( svx::daConnectionResource )) { - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONRES )); + pArray[0].Name = OUString( SC_UNONAME_CONRES ); pArray[0].Value <<= rParam.aDBName; } - pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCTYPE )); + pArray[1].Name = OUString( SC_UNONAME_SRCTYPE ); pArray[1].Value <<= eMode; - pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCOBJ )); + pArray[2].Name = OUString( SC_UNONAME_SRCOBJ ); pArray[2].Value <<= rParam.aStatement; - pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISNATIVE )); + pArray[3].Name = OUString( SC_UNONAME_ISNATIVE ); ScUnoHelpFunctions::SetBoolInAny( pArray[3].Value, rParam.bNative ); } @@ -340,31 +340,31 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq // Sequence fuellen - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISSORTCOLUMNS )); + pArray[0].Name = OUString( SC_UNONAME_ISSORTCOLUMNS ); pArray[0].Value = ::cppu::bool2any(!rParam.bByRow); - pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONTHDR )); + pArray[1].Name = OUString( SC_UNONAME_CONTHDR ); ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, rParam.bHasHeader ); - pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_MAXFLD )); + pArray[2].Name = OUString( SC_UNONAME_MAXFLD ); pArray[2].Value <<= static_cast<sal_Int32>( rParam.GetSortKeyCount() ); - pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SORTFLD )); + pArray[3].Name = OUString( SC_UNONAME_SORTFLD ); pArray[3].Value <<= aFields; - pArray[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_BINDFMT )); + pArray[4].Name = OUString( SC_UNONAME_BINDFMT ); ScUnoHelpFunctions::SetBoolInAny( pArray[4].Value, rParam.bIncludePattern ); - pArray[5].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_COPYOUT )); + pArray[5].Name = OUString( SC_UNONAME_COPYOUT ); ScUnoHelpFunctions::SetBoolInAny( pArray[5].Value, !rParam.bInplace ); - pArray[6].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_OUTPOS )); + pArray[6].Name = OUString( SC_UNONAME_OUTPOS ); pArray[6].Value <<= aOutPos; - pArray[7].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISULIST )); + pArray[7].Name = OUString( SC_UNONAME_ISULIST ); ScUnoHelpFunctions::SetBoolInAny( pArray[7].Value, rParam.bUserDef ); - pArray[8].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_UINDEX )); + pArray[8].Name = OUString( SC_UNONAME_UINDEX ); pArray[8].Value <<= static_cast<sal_Int32>( rParam.nUserIndex ); } @@ -2234,8 +2234,8 @@ uno::Sequence<OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDATABASERANGEOBJ_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); + pArray[0] = OUString( SCDATABASERANGEOBJ_SERVICE ); + pArray[1] = OUString( SCLINKTARGET_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 4f66ccab159e..e089f3b96992 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1019,7 +1019,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 uno::Sequence<beans::PropertyValue> aSequence(1); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); + pArray[0].Name = OUString( SC_UNONAME_PAGESIZE ); pArray[0].Value <<= aPageSize; if( ! pPrinterOptions ) @@ -1066,17 +1066,17 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 long nPropCount = bWasCellRange ? 3 : 2; uno::Sequence<beans::PropertyValue> aSequence(nPropCount); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); + pArray[0].Name = OUString( SC_UNONAME_PAGESIZE ); pArray[0].Value <<= aPageSize; // #i111158# all positions are relative to the whole page, including non-printable area - pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INC_NP_AREA )); + pArray[1].Name = OUString( SC_UNONAME_INC_NP_AREA ); pArray[1].Value = uno::makeAny( sal_True ); if ( bWasCellRange ) { table::CellRangeAddress aRangeAddress( nTab, aCellRange.aStart.Col(), aCellRange.aStart.Row(), aCellRange.aEnd.Col(), aCellRange.aEnd.Row() ); - pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SOURCERANGE )); + pArray[2].Name = OUString( SC_UNONAME_SOURCERANGE ); pArray[2].Value <<= aRangeAddress; } @@ -1559,7 +1559,7 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( ) OUString sName; pDocShell->GetDocument()->GetName( pDocShell->GetDocument()->GetVisibleTab(), sName ); OUString sOUName(sName); - aSeq[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVETABLE)); + aSeq[0].Name = OUString(SC_ACTIVETABLE); aSeq[0].Value <<= sOUName; xCont->insertByIndex( 0, uno::makeAny( aSeq ) ); } @@ -2029,8 +2029,8 @@ uno::Sequence<OUString> SAL_CALL ScModelObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCMODELOBJ_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); + pArray[0] = OUString( SCMODELOBJ_SERVICE ); + pArray[1] = OUString( SCDOCSETTINGS_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index 3e4e0883642d..a051c104aa30 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -134,14 +134,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScFilterOptionsObj_CreateInstance( OUString ScFilterOptionsObj::getImplementationName_Static() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_IMPLNAME )); + return OUString( SCFILTEROPTIONSOBJ_IMPLNAME ); } uno::Sequence<OUString> ScFilterOptionsObj::getSupportedServiceNames_Static() { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_SERVICE )); + pArray[0] = OUString( SCFILTEROPTIONSOBJ_SERVICE ); return aRet; } @@ -152,7 +152,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValu uno::Sequence<beans::PropertyValue> aRet(1); beans::PropertyValue* pArray = aRet.getArray(); - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FILTEROPTIONS )); + pArray[0].Name = OUString( SC_UNONAME_FILTEROPTIONS ); pArray[0].Value <<= aFilterOptions; return aRet; diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 61f2074e529c..22fbf0ecb091 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -253,7 +253,7 @@ uno::Sequence<OUString> ScFunctionAccess::getSupportedServiceNames_Static() { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); + pArray[0] = OUString( SCFUNCTIONACCESS_SERVICE ); return aRet; } @@ -277,8 +277,8 @@ uno::Sequence<OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames() { uno::Sequence<OUString> aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); + pArray[0] = OUString( SCFUNCTIONACCESS_SERVICE ); + pArray[1] = OUString( SCDOCSETTINGS_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 511c4677b515..659f6a49117f 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -443,8 +443,8 @@ uno::Sequence<OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames() throw(uno::RuntimeException) { uno::Sequence<OUString> aRet(2); - aRet[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SCNAMEDRANGEOBJ_SERVICE ) ); - aRet[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE ) ); + aRet[0] = OUString( SCNAMEDRANGEOBJ_SERVICE ); + aRet[1] = OUString( SCLINKTARGET_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 0d0228b5e96d..db59a3444464 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -209,8 +209,8 @@ uno::Sequence<OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSEARCHDESCRIPTOR_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCREPLACEDESCRIPTOR_SERVICE )); + pArray[0] = OUString( SCSEARCHDESCRIPTOR_SERVICE ); + pArray[1] = OUString( SCREPLACEDESCRIPTOR_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 651d3734dd2c..6fc5d69ad99c 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -2210,8 +2210,8 @@ uno::Sequence<OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCTABVIEWOBJ_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCVIEWSETTINGS_SERVICE )); + pArray[0] = OUString( SCTABVIEWOBJ_SERVICE ); + pArray[1] = OUString( SCVIEWSETTINGS_SERVICE ); return aRet; } diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 5410437a5f5c..a15aeffa5034 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -246,7 +246,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) Reference< view::XSelectionSupplier > xSelSupp( xModel->getCurrentController(), UNO_QUERY_THROW ); Reference< beans::XPropertySet > xPropSet( xSelSupp, UNO_QUERY_THROW ); - OUString aPropName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_FILTERED_RANGE_SELECTION ) ); + OUString aPropName( SC_UNO_FILTERED_RANGE_SELECTION ); uno::Any aOldVal = xPropSet->getPropertyValue( aPropName ); uno::Any any; any <<= false; @@ -885,7 +885,7 @@ ScVbaApplication::getTemplatesPath() throw (uno::RuntimeException) OUString SAL_CALL ScVbaApplication::getPathSeparator() throw (uno::RuntimeException) { - static OUString sPathSep( RTL_CONSTASCII_USTRINGPARAM( FILE_PATH_SEPERATOR ) ); + static OUString sPathSep( FILE_PATH_SEPERATOR ); return sPathSep; } diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index 18ccafd8d979..bcc590bf522f 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.cxx @@ -30,7 +30,7 @@ using namespace ooo::vba; using namespace ooo::vba::office::MsoAnimationType; ScVbaAssistant::ScVbaAssistant( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext ): ScVbaAssistantImpl_BASE( xParent, xContext ), -m_sName( RTL_CONSTASCII_USTRINGPARAM( "Clippit" ) ) +m_sName( "Clippit" ) { m_bIsVisible = false; m_nPointsLeft = 795; diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index 24f230b30369..e6de881b81e4 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -95,7 +95,7 @@ ScVbaFormat<Ifc1>::setVerticalAlignment( const uno::Any& _oAlignment) throw (s aVal = uno::makeAny( table::CellVertJustify2::STANDARD ); break; } - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( SC_UNONAME_CELLVJUS ), aVal ); } catch (const uno::Exception& ) { @@ -110,10 +110,10 @@ ScVbaFormat<Ifc1>::getVerticalAlignment( ) throw (script::BasicErrorException, uno::Any aResult = aNULL(); try { - if (!isAmbiguous( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) ) + if (!isAmbiguous( OUString( SC_UNONAME_CELLVJUS ) ) ) { sal_Int32 aAPIAlignment = table::CellVertJustify2::STANDARD; - mxPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) >>= aAPIAlignment; + mxPropertySet->getPropertyValue( OUString( SC_UNONAME_CELLVJUS ) ) >>= aAPIAlignment; switch( aAPIAlignment ) { case table::CellVertJustify2::BOTTOM: @@ -171,7 +171,7 @@ ScVbaFormat<Ifc1>::setHorizontalAlignment( const uno::Any& HorizontalAlignment ) // #FIXME what about the default case above? // shouldn't need the test below if ( aVal.hasValue() ) - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( SC_UNONAME_CELLHJUS ), aVal ); } catch (const uno::Exception& ) { @@ -187,7 +187,7 @@ ScVbaFormat<Ifc1>::getHorizontalAlignment( ) throw (script::BasicErrorException uno::Any NRetAlignment = aNULL(); try { - OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); + OUString sHoriJust( SC_UNONAME_CELLHJUS ); if (!isAmbiguous(sHoriJust)) { table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_BLOCK; @@ -238,7 +238,7 @@ ScVbaFormat<Ifc1>::setOrientation( const uno::Any& _aOrientation ) throw (script break; case excel::XlOrientation::xlHorizontal: aVal = uno::makeAny( table::CellOrientation_STANDARD ); - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ROTANG ) ), uno::makeAny( sal_Int32(0) ) ); + mxPropertySet->setPropertyValue( OUString( SC_UNONAME_ROTANG ), uno::makeAny( sal_Int32(0) ) ); break; case excel::XlOrientation::xlUpward: aVal = uno::makeAny( table::CellOrientation_BOTTOMTOP); @@ -250,7 +250,7 @@ ScVbaFormat<Ifc1>::setOrientation( const uno::Any& _aOrientation ) throw (script // #FIXME what about the default case above? // shouldn't need the test below if ( aVal.hasValue() ) - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( SC_UNONAME_CELLORI ), aVal ); } catch (const uno::Exception& ) @@ -265,10 +265,10 @@ ScVbaFormat<Ifc1>::getOrientation( ) throw (script::BasicErrorException, uno::R uno::Any NRetOrientation = aNULL(); try { - if (!isAmbiguous(OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ))) + if (!isAmbiguous(OUString( SC_UNONAME_CELLORI ))) { table::CellOrientation aOrientation = table::CellOrientation_STANDARD; - if ( !( mxPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ) ) >>= aOrientation ) ) + if ( !( mxPropertySet->getPropertyValue( OUString( SC_UNONAME_CELLORI ) ) >>= aOrientation ) ) throw uno::RuntimeException(); switch(aOrientation) @@ -303,7 +303,7 @@ ScVbaFormat<Ifc1>::setWrapText( const uno::Any& _aWrapText ) throw (script::Basi { try { - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ), _aWrapText); + mxPropertySet->setPropertyValue( OUString( SC_UNONAME_WRAP ), _aWrapText); } catch (const uno::Exception& ) { @@ -318,7 +318,7 @@ ScVbaFormat<Ifc1>::getWrapText( ) throw (script::BasicErrorException, uno::Runt uno::Any aWrap = aNULL(); try { - OUString aPropName( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ) ); + OUString aPropName( OUString( SC_UNONAME_WRAP ) ); if (!isAmbiguous( aPropName )) { aWrap = mxPropertySet->getPropertyValue(aPropName); @@ -367,7 +367,7 @@ ScVbaFormat<Ifc1>::getNumberFormatLocal( ) throw (script::BasicErrorException, uno::Any aRet = uno::makeAny( OUString() ); try { - OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); + OUString sPropName( SC_UNO_DP_NUMBERFO ); if (!isAmbiguous( sPropName )) { @@ -378,7 +378,7 @@ ScVbaFormat<Ifc1>::getNumberFormatLocal( ) throw (script::BasicErrorException, throw uno::RuntimeException(); OUString sFormat; - xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; + xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( FORMATSTRING )) >>= sFormat; aRet = uno::makeAny( sFormat.toAsciiLowerCase() ); } @@ -399,7 +399,7 @@ ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t { OUString sLocalFormatString; sal_Int32 nFormat = -1; - OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); + OUString sNumFormat( SC_UNO_DP_NUMBERFO ); if ( !(_oLocalFormatString >>= sLocalFormatString ) || !( mxPropertySet->getPropertyValue(sNumFormat) >>= nFormat ) ) throw uno::RuntimeException(); @@ -407,7 +407,7 @@ ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t sLocalFormatString = sLocalFormatString.toAsciiUpperCase(); initializeNumberFormats(); lang::Locale aRangeLocale; - xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; + xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( LOCALE ) ) >>= aRangeLocale; sal_Int32 nNewFormat = xNumberFormats->queryKey(sLocalFormatString, aRangeLocale, sal_True); if (nNewFormat == -1) @@ -440,9 +440,9 @@ ScVbaFormat<Ifc1>::setNumberFormat( const uno::Any& _oFormatString ) throw (scri nFormat = xNumberFormats->addNew(sFormatString, aDefaultLocale); lang::Locale aRangeLocale; - xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; + xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( LOCALE ) ) >>= aRangeLocale; sal_Int32 nNewFormat = xNumberFormatTypes->getFormatForLocale(nFormat, aRangeLocale); - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ), uno::makeAny( nNewFormat)); + mxPropertySet->setPropertyValue( OUString( SC_UNO_DP_NUMBERFO ), uno::makeAny( nNewFormat)); } catch (const uno::Exception& ) { @@ -462,12 +462,12 @@ ScVbaFormat<Ifc1>::setIndentLevel( const uno::Any& _aLevel ) throw (script::Basi throw uno::RuntimeException(); table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_STANDARD; - OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); + OUString sHoriJust( SC_UNONAME_CELLHJUS ); if ( !( mxPropertySet->getPropertyValue(sHoriJust) >>= aAPIAlignment ) ) throw uno::RuntimeException(); if (aAPIAlignment == table::CellHoriJustify_STANDARD) mxPropertySet->setPropertyValue( sHoriJust, uno::makeAny( table::CellHoriJustify_LEFT) ) ; - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ), uno::makeAny( sal_Int16(nLevel * 352.8) ) ); + mxPropertySet->setPropertyValue( OUString( SC_UNONAME_PINDENT ), uno::makeAny( sal_Int16(nLevel * 352.8) ) ); } catch (const uno::Exception& ) { @@ -482,7 +482,7 @@ ScVbaFormat<Ifc1>::getIndentLevel( ) throw (script::BasicErrorException, uno::R uno::Any NRetIndentLevel = aNULL(); try { - OUString sParaIndent( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ); + OUString sParaIndent( SC_UNONAME_PINDENT ); if (!isAmbiguous(sParaIndent)) { sal_Int16 IndentLevel = 0; @@ -509,7 +509,7 @@ ScVbaFormat<Ifc1>::setLocked( const uno::Any& _aLocked ) throw (script::BasicErr if ( !( _aLocked >>= bIsLocked ) ) throw uno::RuntimeException(); util::CellProtection aCellProtection; - OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( SC_UNONAME_CELLPRO ); mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection; aCellProtection.IsLocked = bIsLocked; mxPropertySet->setPropertyValue(sCellProt, uno::makeAny( aCellProtection ) ); @@ -529,7 +529,7 @@ ScVbaFormat<Ifc1>::setFormulaHidden( const uno::Any& FormulaHidden ) throw (scri sal_Bool bIsFormulaHidden = false; FormulaHidden >>= bIsFormulaHidden; util::CellProtection aCellProtection; - OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( SC_UNONAME_CELLPRO ); mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection; aCellProtection.IsFormulaHidden = bIsFormulaHidden; mxPropertySet->setPropertyValue(sCellProt,uno::makeAny(aCellProtection)); @@ -547,7 +547,7 @@ ScVbaFormat<Ifc1>::getLocked( ) throw (script::BasicErrorException, uno::Runtim uno::Any aCellProtection = aNULL(); try { - OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( SC_UNONAME_CELLPRO ); if (!isAmbiguous(sCellProt)) { @@ -581,7 +581,7 @@ ScVbaFormat<Ifc1>::getFormulaHidden( ) throw (script::BasicErrorException, uno: uno::Any aBoolRet = aNULL(); try { - OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( SC_UNONAME_CELLPRO ); if (!isAmbiguous(sCellProt)) { SfxItemSet* pDataSet = getCurrentDataSet(); @@ -613,7 +613,7 @@ ScVbaFormat<Ifc1>::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (script:: { try { - mxPropertySet->setPropertyValue(OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ), ShrinkToFit); + mxPropertySet->setPropertyValue(OUString( SC_UNONAME_SHRINK_TO_FIT ), ShrinkToFit); } catch (const uno::Exception& ) { @@ -629,7 +629,7 @@ ScVbaFormat<Ifc1>::getShrinkToFit( ) throw (script::BasicErrorException, uno::R uno::Any aRet = aNULL(); try { - OUString sShrinkToFit( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ); + OUString sShrinkToFit( SC_UNONAME_SHRINK_TO_FIT ); if (!isAmbiguous(sShrinkToFit)) aRet = mxPropertySet->getPropertyValue(sShrinkToFit); } @@ -664,7 +664,7 @@ ScVbaFormat<Ifc1>::setReadingOrder( const uno::Any& ReadingOrder ) throw (script default: DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( SC_UNONAME_WRITING ), aVal ); } catch (const uno::Exception& ) { @@ -680,7 +680,7 @@ ScVbaFormat<Ifc1>::getReadingOrder( ) throw (script::BasicErrorException, uno:: uno::Any NRetReadingOrder = aNULL(); try { - OUString sWritingMode( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ); + OUString sWritingMode( SC_UNONAME_WRITING ); if (!isAmbiguous(sWritingMode)) { text::WritingMode aWritingMode = text::WritingMode_LR_TB; @@ -713,7 +713,7 @@ ScVbaFormat< Ifc1 >::getNumberFormat( ) throw (script::BasicErrorException, uno try { sal_Int32 nFormat = -1; - OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); + OUString sNumFormat( SC_UNO_DP_NUMBERFO ); if (!isAmbiguous(sNumFormat) && ( mxPropertySet->getPropertyValue(sNumFormat) >>= nFormat) ) { @@ -721,7 +721,7 @@ ScVbaFormat< Ifc1 >::getNumberFormat( ) throw (script::BasicErrorException, uno sal_Int32 nNewFormat = xNumberFormatTypes->getFormatForLocale(nFormat, getDefaultLocale() ); OUString sFormat; - xNumberFormats->getByKey(nNewFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; + xNumberFormats->getByKey(nNewFormat)->getPropertyValue( OUString( FORMATSTRING )) >>= sFormat; aFormat = uno::makeAny( sFormat ); } } diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index da9f0bb6b633..6d014547d5be 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -35,17 +35,17 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -const static OUString VALIDATION( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_VALIDAT ) ); -const static OUString IGNOREBLANK( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_IGNOREBL ) ); -const static OUString SHOWINPUT( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWINP ) ); -const static OUString SHOWERROR( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWERR ) ); -const static OUString ERRORTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRTITLE ) ); -const static OUString INPUTTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPTITLE ) ); -const static OUString INPUTMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPMESS ) ); -const static OUString ERRORMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRMESS ) ); -const static OUString STYPE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TYPE ) ); -const static OUString SHOWLIST( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWLIST ) ); -const static OUString ALERTSTYLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRALSTY ) ); +const static OUString VALIDATION( SC_UNONAME_VALIDAT ); +const static OUString IGNOREBLANK( SC_UNONAME_IGNOREBL ); +const static OUString SHOWINPUT( SC_UNONAME_SHOWINP ); +const static OUString SHOWERROR( SC_UNONAME_SHOWERR ); +const static OUString ERRORTITLE( SC_UNONAME_ERRTITLE ); +const static OUString INPUTTITLE( SC_UNONAME_INPTITLE ); +const static OUString INPUTMESS( SC_UNONAME_INPMESS ); +const static OUString ERRORMESS( SC_UNONAME_ERRMESS ); +const static OUString STYPE( SC_UNONAME_TYPE ); +const static OUString SHOWLIST( SC_UNONAME_SHOWLIST ); +const static OUString ALERTSTYLE( SC_UNONAME_ERRALSTY ); static void lcl_setValidationProps( const uno::Reference< table::XCellRange >& xRange, const uno::Reference< beans::XPropertySet >& xProps ) diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index dab52fa8b631..caf68a06c856 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -309,7 +309,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) static sal_Int32 nCrudLen = sCrud.getLength(); OUString sTitle; - getFrameProps()->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) ) >>= sTitle; + getFrameProps()->getPropertyValue( OUString( SC_UNONAME_TITLE ) ) >>= sTitle; sal_Int32 nCrudIndex = sTitle.indexOf( sCrud ); // adjust title ( by removing crud ) // sCrud string present @@ -345,7 +345,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setCaption( const uno::Any& _caption ) throw (uno::RuntimeException) { - getFrameProps()->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TITLE ) ), _caption ); + getFrameProps()->setPropertyValue( OUString( SC_UNONAME_TITLE ), _caption ); } uno::Any SAL_CALL @@ -495,7 +495,7 @@ ScVbaWindow::RangeSelection() throw (script::BasicErrorException, uno::RuntimeEx ::sal_Bool SAL_CALL ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); + OUString sName( SC_UNO_SHOWGRID ); sal_Bool bGrid = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bGrid; return bGrid; @@ -505,14 +505,14 @@ ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayGridlines( ::sal_Bool _displaygridlines ) throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); + OUString sName( SC_UNO_SHOWGRID ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _displaygridlines )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); + OUString sName( SC_UNO_COLROWHDR ); sal_Bool bHeading = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bHeading; return bHeading; @@ -521,14 +521,14 @@ ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayHeadings( ::sal_Bool _bDisplayHeadings ) throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); + OUString sName( SC_UNO_COLROWHDR ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHeadings )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); + OUString sName( SC_UNO_HORSCROLL ); sal_Bool bHorizontalScrollBar = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bHorizontalScrollBar; return bHorizontalScrollBar; @@ -537,14 +537,14 @@ ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayHorizontalScrollBar( ::sal_Bool _bDisplayHorizontalScrollBar ) throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); + OUString sName( SC_UNO_HORSCROLL ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHorizontalScrollBar )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); + OUString sName( SC_UNO_OUTLSYMB ); sal_Bool bOutline = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bOutline; return bOutline; @@ -553,14 +553,14 @@ ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayOutline( ::sal_Bool _bDisplayOutline ) throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); + OUString sName( SC_UNO_OUTLSYMB ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayOutline )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); + OUString sName( SC_UNO_VERTSCROLL ); sal_Bool bVerticalScrollBar = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bVerticalScrollBar; return bVerticalScrollBar; @@ -569,14 +569,14 @@ ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayVerticalScrollBar( ::sal_Bool _bDisplayVerticalScrollBar ) throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); + OUString sName( SC_UNO_VERTSCROLL ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayVerticalScrollBar )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); + OUString sName( SC_UNO_SHEETTABS ); sal_Bool bWorkbookTabs = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bWorkbookTabs; return bWorkbookTabs; @@ -585,7 +585,7 @@ ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); + OUString sName( SC_UNO_SHEETTABS ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayWorkbookTabs )); } @@ -731,7 +731,7 @@ uno::Any SAL_CALL ScVbaWindow::getZoom() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = getControllerProps(); - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ZOOMTYPE ) ); + OUString sName( SC_UNO_ZOOMTYPE ); sal_Int16 nZoomType = view::DocumentZoomType::PAGE_WIDTH; xProps->getPropertyValue( sName ) >>= nZoomType; if( nZoomType == view::DocumentZoomType::PAGE_WIDTH ) @@ -740,7 +740,7 @@ ScVbaWindow::getZoom() throw (uno::RuntimeException) } else if( nZoomType == view::DocumentZoomType::BY_VALUE ) { - sName = OUString( RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ZOOMVALUE)); + sName = OUString( SC_UNO_ZOOMVALUE); sal_Int16 nZoom = 100; xProps->getPropertyValue( sName ) >>= nZoom; return uno::makeAny( nZoom ); diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 5f191ac70425..5198fc8b53ff 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -345,7 +345,7 @@ ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/ sFormat = OUString::valueOf( (sal_Int32)nDelim ) + sRestOfFormat; sProps[ nIndex++ ].Value <<= sFormat; sProps[ nIndex ].Name = OUString("FilterName"); - sProps[ nIndex++ ].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM("Text - txt - csv (StarCalc)") ); + sProps[ nIndex++ ].Value <<= OUString( "Text - txt - csv (StarCalc)" ); // Ensure WORKAROUND_CSV_TXT_BUG_i60158 gets called in typedetection.cxx so // csv is forced for deep detected 'writerxxx' types sProps[ nIndex ].Name = OUString("DocumentService"); diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 4c9a1fa96bb7..f96df2ffc0ac 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -111,7 +111,7 @@ using namespace ooo::vba; static void getNewSpreadsheetName (OUString &aNewName, OUString aOldName, uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc ) { if (!xSpreadDoc.is()) - throw lang::IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( "getNewSpreadsheetName() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); + throw lang::IllegalArgumentException( OUString( "getNewSpreadsheetName() xSpreadDoc is null" ), uno::Reference< uno::XInterface >(), 1 ); static OUString aUnderScore( "_" ); int currentNum =2; aNewName = aOldName + aUnderScore + OUString::number(currentNum) ; @@ -125,7 +125,7 @@ static void getNewSpreadsheetName (OUString &aNewName, OUString aOldName, uno::R static void removeAllSheets( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, OUString aSheetName) { if (!xSpreadDoc.is()) - throw lang::IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( "removeAllSheets() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); + throw lang::IllegalArgumentException( OUString( "removeAllSheets() xSpreadDoc is null" ), uno::Reference< uno::XInterface >(), 1 ); uno::Reference<sheet::XSpreadsheets> xSheets = xSpreadDoc->getSheets(); uno::Reference <container::XIndexAccess> xIndex( xSheets, uno::UNO_QUERY ); diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 581f14f030e3..bb6d23ee6b3e 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -491,7 +491,7 @@ ScVbaWorksheets::getServiceNames() bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException ) { if (!xSpreadDoc.is()) - throw lang::IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( "nameExists() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); + throw lang::IllegalArgumentException( OUString( "nameExists() xSpreadDoc is null" ), uno::Reference< uno::XInterface >(), 1 ); uno::Reference <container::XIndexAccess> xIndex( xSpreadDoc->getSheets(), uno::UNO_QUERY ); if ( xIndex.is() ) { diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 6338805a6617..96a08ce284f5 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -2048,7 +2048,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet if (!xPropSet.is()) continue; - Any any = xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_NUMBERFO)) ); + Any any = xPropSet->getPropertyValue( OUString(SC_UNO_DP_NUMBERFO) ); sal_Int32 nNumFmt = 0; if (!(any >>= nNumFmt)) continue; diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 7a4863bbbd36..f5d7e9ed200d 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -112,45 +112,45 @@ void ScViewDataTable::WriteUserDataSequence(uno::Sequence <beans::PropertyValue> beans::PropertyValue* pSettings = rSettings.getArray(); if (pSettings) { - pSettings[SC_CURSOR_X].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURSORPOSITIONX)); + pSettings[SC_CURSOR_X].Name = OUString(SC_CURSORPOSITIONX); pSettings[SC_CURSOR_X].Value <<= sal_Int32(nCurX); - pSettings[SC_CURSOR_Y].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURSORPOSITIONY)); + pSettings[SC_CURSOR_Y].Name = OUString(SC_CURSORPOSITIONY); pSettings[SC_CURSOR_Y].Value <<= sal_Int32(nCurY); - pSettings[SC_HORIZONTAL_SPLIT_MODE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSPLITMODE)); + pSettings[SC_HORIZONTAL_SPLIT_MODE].Name = OUString(SC_HORIZONTALSPLITMODE); pSettings[SC_HORIZONTAL_SPLIT_MODE].Value <<= sal_Int16(eHSplitMode); - pSettings[SC_VERTICAL_SPLIT_MODE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VERTICALSPLITMODE)); + pSettings[SC_VERTICAL_SPLIT_MODE].Name = OUString(SC_VERTICALSPLITMODE); pSettings[SC_VERTICAL_SPLIT_MODE].Value <<= sal_Int16(eVSplitMode); - pSettings[SC_HORIZONTAL_SPLIT_POSITION].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSPLITPOSITION)); + pSettings[SC_HORIZONTAL_SPLIT_POSITION].Name = OUString(SC_HORIZONTALSPLITPOSITION); if (eHSplitMode == SC_SPLIT_FIX) pSettings[SC_HORIZONTAL_SPLIT_POSITION].Value <<= sal_Int32(nFixPosX); else pSettings[SC_HORIZONTAL_SPLIT_POSITION].Value <<= sal_Int32(nHSplitPos); - pSettings[SC_VERTICAL_SPLIT_POSITION].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VERTICALSPLITPOSITION)); + pSettings[SC_VERTICAL_SPLIT_POSITION].Name = OUString(SC_VERTICALSPLITPOSITION); if (eVSplitMode == SC_SPLIT_FIX) pSettings[SC_VERTICAL_SPLIT_POSITION].Value <<= sal_Int32(nFixPosY); else pSettings[SC_VERTICAL_SPLIT_POSITION].Value <<= sal_Int32(nVSplitPos); - pSettings[SC_ACTIVE_SPLIT_RANGE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVESPLITRANGE)); + pSettings[SC_ACTIVE_SPLIT_RANGE].Name = OUString(SC_ACTIVESPLITRANGE); pSettings[SC_ACTIVE_SPLIT_RANGE].Value <<= sal_Int16(eWhichActive); - pSettings[SC_POSITION_LEFT].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONLEFT)); + pSettings[SC_POSITION_LEFT].Name = OUString(SC_POSITIONLEFT); pSettings[SC_POSITION_LEFT].Value <<= sal_Int32(nPosX[SC_SPLIT_LEFT]); - pSettings[SC_POSITION_RIGHT].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONRIGHT)); + pSettings[SC_POSITION_RIGHT].Name = OUString(SC_POSITIONRIGHT); pSettings[SC_POSITION_RIGHT].Value <<= sal_Int32(nPosX[SC_SPLIT_RIGHT]); - pSettings[SC_POSITION_TOP].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONTOP)); + pSettings[SC_POSITION_TOP].Name = OUString(SC_POSITIONTOP); pSettings[SC_POSITION_TOP].Value <<= sal_Int32(nPosY[SC_SPLIT_TOP]); - pSettings[SC_POSITION_BOTTOM].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONBOTTOM)); + pSettings[SC_POSITION_BOTTOM].Name = OUString(SC_POSITIONBOTTOM); pSettings[SC_POSITION_BOTTOM].Value <<= sal_Int32(nPosY[SC_SPLIT_BOTTOM]); sal_Int32 nZoomValue ((aZoomY.GetNumerator() * 100) / aZoomY.GetDenominator()); sal_Int32 nPageZoomValue ((aPageZoomY.GetNumerator() * 100) / aPageZoomY.GetDenominator()); - pSettings[SC_TABLE_ZOOM_TYPE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMTYPE)); + pSettings[SC_TABLE_ZOOM_TYPE].Name = OUString(SC_ZOOMTYPE); pSettings[SC_TABLE_ZOOM_TYPE].Value <<= sal_Int16(eZoomType); - pSettings[SC_TABLE_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMVALUE)); + pSettings[SC_TABLE_ZOOM_VALUE].Name = OUString(SC_ZOOMVALUE); pSettings[SC_TABLE_ZOOM_VALUE].Value <<= nZoomValue; - pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE)); + pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Name = OUString(SC_PAGEVIEWZOOMVALUE); pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue; - pSettings[SC_TABLE_SHOWGRID].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID)); + pSettings[SC_TABLE_SHOWGRID].Name = OUString(SC_UNO_SHOWGRID); pSettings[SC_TABLE_SHOWGRID].Value <<= static_cast<sal_Bool>(bShowGrid); } } @@ -2613,8 +2613,8 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe if (pSettings) { sal_uInt16 nViewID(pViewShell->GetViewFrame()->GetCurViewId()); - pSettings[SC_VIEW_ID].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VIEWID)); - OUStringBuffer sBuffer(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VIEW))); + pSettings[SC_VIEW_ID].Name = OUString(SC_VIEWID); + OUStringBuffer sBuffer(OUString(SC_VIEW)); ::sax::Converter::convertNumber(sBuffer, static_cast<sal_Int32>(nViewID)); pSettings[SC_VIEW_ID].Value <<= sBuffer.makeStringAndClear(); @@ -2646,61 +2646,61 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe } } } - pSettings[SC_TABLE_VIEWSETTINGS].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_TABLES)); + pSettings[SC_TABLE_VIEWSETTINGS].Name = OUString(SC_TABLES); pSettings[SC_TABLE_VIEWSETTINGS].Value <<= xNameContainer; OUString sName; GetDocument()->GetName( nTabNo, sName ); - pSettings[SC_ACTIVE_TABLE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVETABLE)); + pSettings[SC_ACTIVE_TABLE].Name = OUString(SC_ACTIVETABLE); pSettings[SC_ACTIVE_TABLE].Value <<= sName; - pSettings[SC_HORIZONTAL_SCROLL_BAR_WIDTH].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSCROLLBARWIDTH)); + pSettings[SC_HORIZONTAL_SCROLL_BAR_WIDTH].Name = OUString(SC_HORIZONTALSCROLLBARWIDTH); pSettings[SC_HORIZONTAL_SCROLL_BAR_WIDTH].Value <<= sal_Int32(pView->GetTabBarWidth()); sal_Int32 nZoomValue ((pThisTab->aZoomY.GetNumerator() * 100) / pThisTab->aZoomY.GetDenominator()); sal_Int32 nPageZoomValue ((pThisTab->aPageZoomY.GetNumerator() * 100) / pThisTab->aPageZoomY.GetDenominator()); - pSettings[SC_ZOOM_TYPE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMTYPE)); + pSettings[SC_ZOOM_TYPE].Name = OUString(SC_ZOOMTYPE); pSettings[SC_ZOOM_TYPE].Value <<= sal_Int16(pThisTab->eZoomType); - pSettings[SC_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMVALUE)); + pSettings[SC_ZOOM_VALUE].Name = OUString(SC_ZOOMVALUE); pSettings[SC_ZOOM_VALUE].Value <<= nZoomValue; - pSettings[SC_PAGE_VIEW_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE)); + pSettings[SC_PAGE_VIEW_ZOOM_VALUE].Name = OUString(SC_PAGEVIEWZOOMVALUE); pSettings[SC_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue; - pSettings[SC_PAGE_BREAK_PREVIEW].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SHOWPAGEBREAKPREVIEW)); + pSettings[SC_PAGE_BREAK_PREVIEW].Name = OUString(SC_SHOWPAGEBREAKPREVIEW); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_PAGE_BREAK_PREVIEW].Value, bPagebreak); if (pOptions) { - pSettings[SC_SHOWZERO].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWZERO)); + pSettings[SC_SHOWZERO].Name = OUString(SC_UNO_SHOWZERO); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWZERO].Value, pOptions->GetOption( VOPT_NULLVALS ) ); - pSettings[SC_SHOWNOTES].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWNOTES)); + pSettings[SC_SHOWNOTES].Name = OUString(SC_UNO_SHOWNOTES); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWNOTES].Value, pOptions->GetOption( VOPT_NOTES ) ); - pSettings[SC_SHOWGRID].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID)); + pSettings[SC_SHOWGRID].Name = OUString(SC_UNO_SHOWGRID); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWGRID].Value, pOptions->GetOption( VOPT_GRID ) ); - pSettings[SC_GRIDCOLOR].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_GRIDCOLOR)); + pSettings[SC_GRIDCOLOR].Name = OUString(SC_UNO_GRIDCOLOR); String aColorName; Color aColor = pOptions->GetGridColor(&aColorName); pSettings[SC_GRIDCOLOR].Value <<= static_cast<sal_Int64>(aColor.GetColor()); - pSettings[SC_SHOWPAGEBR].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWPAGEBR)); + pSettings[SC_SHOWPAGEBR].Name = OUString(SC_UNO_SHOWPAGEBR); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWPAGEBR].Value, pOptions->GetOption( VOPT_PAGEBREAKS ) ); - pSettings[SC_COLROWHDR].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COLROWHDR)); + pSettings[SC_COLROWHDR].Name = OUString(SC_UNO_COLROWHDR); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_COLROWHDR].Value, pOptions->GetOption( VOPT_HEADER ) ); - pSettings[SC_SHEETTABS].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHEETTABS)); + pSettings[SC_SHEETTABS].Name = OUString(SC_UNO_SHEETTABS); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHEETTABS].Value, pOptions->GetOption( VOPT_TABCONTROLS ) ); - pSettings[SC_OUTLSYMB].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_OUTLSYMB)); + pSettings[SC_OUTLSYMB].Name = OUString(SC_UNO_OUTLSYMB); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_OUTLSYMB].Value, pOptions->GetOption( VOPT_OUTLINER ) ); const ScGridOptions& aGridOpt = pOptions->GetGridOptions(); - pSettings[SC_SNAPTORASTER].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SNAPTORASTER)); + pSettings[SC_SNAPTORASTER].Name = OUString(SC_UNO_SNAPTORASTER); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SNAPTORASTER].Value, aGridOpt.GetUseGridSnap() ); - pSettings[SC_RASTERVIS].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERVIS)); + pSettings[SC_RASTERVIS].Name = OUString(SC_UNO_RASTERVIS); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERVIS].Value, aGridOpt.GetGridVisible() ); - pSettings[SC_RASTERRESX].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERRESX)); + pSettings[SC_RASTERRESX].Name = OUString(SC_UNO_RASTERRESX); pSettings[SC_RASTERRESX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawX() ); - pSettings[SC_RASTERRESY].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERRESY)); + pSettings[SC_RASTERRESY].Name = OUString(SC_UNO_RASTERRESY); pSettings[SC_RASTERRESY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawY() ); - pSettings[SC_RASTERSUBX].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSUBX)); + pSettings[SC_RASTERSUBX].Name = OUString(SC_UNO_RASTERSUBX); pSettings[SC_RASTERSUBX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionX() ); - pSettings[SC_RASTERSUBY].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSUBY)); + pSettings[SC_RASTERSUBY].Name = OUString(SC_UNO_RASTERSUBY); pSettings[SC_RASTERSUBY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionY() ); - pSettings[SC_RASTERSYNC].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSYNC)); + pSettings[SC_RASTERSYNC].Name = OUString(SC_UNO_RASTERSYNC); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERSYNC].Value, aGridOpt.GetSynchronize() ); } } diff --git a/scripting/source/inc/util/scriptingconstants.hxx b/scripting/source/inc/util/scriptingconstants.hxx index 8fcf16577473..e45161ed1e6e 100644 --- a/scripting/source/inc/util/scriptingconstants.hxx +++ b/scripting/source/inc/util/scriptingconstants.hxx @@ -53,15 +53,15 @@ private: ScriptingConstantsPool( const ScriptingConstantsPool & ); ScriptingConstantsPool& operator = ( const ScriptingConstantsPool & ); ScriptingConstantsPool() - : DOC_REF( RTL_CONSTASCII_USTRINGPARAM( "SCRIPTING_DOC_REF" ) ), - DOC_STORAGE_ID( RTL_CONSTASCII_USTRINGPARAM( - "SCRIPTING_DOC_STORAGE_ID" ) ), - DOC_URI( RTL_CONSTASCII_USTRINGPARAM( "SCRIPTING_DOC_URI" ) ), - RESOLVED_STORAGE_ID( RTL_CONSTASCII_USTRINGPARAM( - "SCRIPTING_RESOLVED_STORAGE_ID" ) ), - SCRIPT_INFO( RTL_CONSTASCII_USTRINGPARAM( "SCRIPT_INFO" ) ), - SCRIPTSTORAGEMANAGER_SERVICE( RTL_CONSTASCII_USTRINGPARAM( - "/singletons/com.sun.star.script.framework.storage.theScriptStorageManager" ) ), + : DOC_REF( "SCRIPTING_DOC_REF" ), + DOC_STORAGE_ID( + "SCRIPTING_DOC_STORAGE_ID" ), + DOC_URI( "SCRIPTING_DOC_URI" ), + RESOLVED_STORAGE_ID( + "SCRIPTING_RESOLVED_STORAGE_ID" ), + SCRIPT_INFO( "SCRIPT_INFO" ), + SCRIPTSTORAGEMANAGER_SERVICE( + "/singletons/com.sun.star.script.framework.storage.theScriptStorageManager" ), SHARED_STORAGE_ID( 0 ), USER_STORAGE_ID( 1 ), DOC_STORAGE_ID_NOT_SET( -1 ) {} diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx index 9e4f04ff0bc1..3d7994e097e9 100644 --- a/sdext/source/minimizer/pppoptimizer.cxx +++ b/sdext/source/minimizer/pppoptimizer.cxx @@ -188,7 +188,7 @@ Sequence< OUString > PPPOptimizer_getSupportedServiceNames() { Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) ); + pArray[0] = OUString ( SERVICE_NAME ); return aRet; } diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx index 5644f7803edb..b5e8fd270495 100644 --- a/sfx2/source/appl/imestatuswindow.cxx +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -223,9 +223,9 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig() css::uno::UNO_QUERY); if (!m_xConfig.is()) throw css::uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "null com.sun.star.configuration." - "ConfigurationUpdateAccess")), + "ConfigurationUpdateAccess"), 0); bAdd = true; } diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 97d04dd6cde5..c1c9fdf5d5d4 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -159,7 +159,7 @@ LayoutManagerListener::LayoutManagerListener( SfxWorkWindow* pWrkWin ) : m_bHasFrame( sal_False ), m_pWrkWin( pWrkWin ), - m_aLayoutManagerPropName( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) + m_aLayoutManagerPropName( "LayoutManager" ) { } @@ -603,10 +603,10 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar bShowStatusBar( sal_False ), #endif m_nLock( 0 ), - m_aStatusBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" )), - m_aLayoutManagerPropName( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )), - m_aTbxTypeName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/" )), - m_aProgressBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/progressbar/progressbar" )) + m_aStatusBarResName( "private:resource/statusbar/statusbar" ), + m_aLayoutManagerPropName( "LayoutManager" ), + m_aTbxTypeName( "private:resource/toolbar/" ), + m_aProgressBarResName( "private:resource/progressbar/progressbar" ) { DBG_CTOR(SfxWorkWindow, 0); DBG_ASSERT (pBindings, "No Bindings!"); diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx index 33ddb3341dbf..3432fdfa6b08 100644 --- a/sfx2/source/doc/doctemplateslocal.cxx +++ b/sfx2/source/doc/doctemplateslocal.cxx @@ -114,10 +114,10 @@ uno::Sequence< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizati // ----------------------------------- DocTemplLocaleHelper::DocTemplLocaleHelper() -: m_aGroupListElement( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:template-group-list" ) ) -, m_aGroupElement( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:template-group" ) ) -, m_aNameAttr( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:name" ) ) -, m_aUINameAttr( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:default-ui-name" ) ) +: m_aGroupListElement( "groupuinames:template-group-list" ) +, m_aGroupElement( "groupuinames:template-group" ) +, m_aNameAttr( "groupuinames:name" ) +, m_aUINameAttr( "groupuinames:default-ui-name" ) { } diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index ee285605051a..c6a40f94e2f6 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -113,11 +113,11 @@ bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberI case 0: { ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOM_PARAMS ); - aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUE )); + aSeq[0].Name = OUString( ZOOM_PARAM_VALUE ); aSeq[0].Value <<= sal_Int32( GetValue() ); - aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUESET )); + aSeq[1].Name = OUString( ZOOM_PARAM_VALUESET ); aSeq[1].Value <<= sal_Int16( nValueSet ); - aSeq[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_TYPE )); + aSeq[2].Name = OUString( ZOOM_PARAM_TYPE ); aSeq[2].Value <<= sal_Int16( eType ); rVal <<= aSeq; break; diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index eec2d87a9cbc..866c78ae0d4a 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -46,13 +46,13 @@ static const sal_Int32 CACHE_SIZE = 256; static Sequence< OUString > core_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) ); + seqNames.getArray()[0] = OUString( SERVICENAME ); return seqNames; } static OUString core_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } //__________________________________________________________________________________________________ IdlReflectionServiceImpl::IdlReflectionServiceImpl( @@ -368,7 +368,7 @@ Reference< XIdlClass > IdlReflectionServiceImpl::forType( typelib_TypeDescriptio return xRet; } throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("IdlReflectionServiceImpl::forType() failed!") ), + OUString( "IdlReflectionServiceImpl::forType() failed!" ), (XWeak *)(OWeakObject *)this ); } @@ -382,8 +382,8 @@ const Mapping & IdlReflectionServiceImpl::getCpp2Uno() if (! _aCpp2Uno.is()) { _aCpp2Uno = Mapping( - OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ), - OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ) ); + OUString( CPPU_CURRENT_LANGUAGE_BINDING_NAME ), + OUString( UNO_LB_UNO ) ); OSL_ENSURE( _aCpp2Uno.is(), "### cannot get c++ to uno mapping!" ); if (! _aCpp2Uno.is()) { @@ -405,8 +405,8 @@ const Mapping & IdlReflectionServiceImpl::getUno2Cpp() if (! _aUno2Cpp.is()) { _aUno2Cpp = Mapping( - OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ), - OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ) ); + OUString( UNO_LB_UNO ), + OUString( CPPU_CURRENT_LANGUAGE_BINDING_NAME ) ); OSL_ENSURE( _aUno2Cpp.is(), "### cannot get uno to c++ mapping!" ); if (! _aUno2Cpp.is()) { diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index d199c9361cef..28310227beaa 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -323,9 +323,8 @@ void IdlAttributeFieldImpl::checkException( } else { throw WrappedTargetRuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "non-RuntimeException occurred when accessing an" - " interface type attribute")), + " interface type attribute"), context, e); } } diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index c2fdac4d32d3..71c1409fe8ec 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -83,21 +83,21 @@ struct StringPool OUString com_sun_star_registry_SimpleRegistry; OUString Registry; StringPool() - : sImplementationName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) ) - , sServiceName( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME ) ) - , TMP( RTL_CONSTASCII_USTRINGPARAM( "TMP" ) ) - , TEMP( RTL_CONSTASCII_USTRINGPARAM( "TEMP" ) ) - , slash_UNO_slash_REGISTRY_LINKS( RTL_CONSTASCII_USTRINGPARAM("/UNO/REGISTRY_LINKS")) - , slash_IMPLEMENTATIONS( RTL_CONSTASCII_USTRINGPARAM( "/IMPLEMENTATIONS" ) ) - , slash_UNO( RTL_CONSTASCII_USTRINGPARAM("/UNO")) - , slash_UNO_slash_SERVICES( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) - , slash_UNO_slash_SINGLETONS( RTL_CONSTASCII_USTRINGPARAM("/UNO/SINGLETONS")) - , slash_SERVICES( RTL_CONSTASCII_USTRINGPARAM("/SERVICES/") ) - , slash_UNO_slash_LOCATION( RTL_CONSTASCII_USTRINGPARAM("/UNO/LOCATION") ) - , slash_UNO_slash_ACTIVATOR( RTL_CONSTASCII_USTRINGPARAM("/UNO/ACTIVATOR") ) - , colon_old( RTL_CONSTASCII_USTRINGPARAM(":old")) - , com_sun_star_registry_SimpleRegistry(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.SimpleRegistry") ) - , Registry( RTL_CONSTASCII_USTRINGPARAM("Registry") ) + : sImplementationName( IMPLNAME ) + , sServiceName( SERVICENAME ) + , TMP( "TMP" ) + , TEMP( "TEMP" ) + , slash_UNO_slash_REGISTRY_LINKS( "/UNO/REGISTRY_LINKS") + , slash_IMPLEMENTATIONS( "/IMPLEMENTATIONS" ) + , slash_UNO( "/UNO") + , slash_UNO_slash_SERVICES( "/UNO/SERVICES") + , slash_UNO_slash_SINGLETONS( "/UNO/SINGLETONS") + , slash_SERVICES( "/SERVICES/" ) + , slash_UNO_slash_LOCATION( "/UNO/LOCATION" ) + , slash_UNO_slash_ACTIVATOR( "/UNO/ACTIVATOR" ) + , colon_old( ":old") + , com_sun_star_registry_SimpleRegistry("com.sun.star.registry.SimpleRegistry" ) + , Registry( "Registry" ) {} private: StringPool( const StringPool & ); @@ -1082,7 +1082,7 @@ static void prepareRegistry( if (!subKeys.getLength()) { throw InvalidRegistryException( - OUString( RTL_CONSTASCII_USTRINGPARAM( "prepareRegistry(): source registry is empty" ) ), + OUString( "prepareRegistry(): source registry is empty" ), Reference< XInterface > () ); } @@ -1568,9 +1568,9 @@ void ImplementationRegistration::prepareRegister( else { throw CannotRegisterImplementationException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "ImplementationRegistration::registerImplementation() " - "no componentcontext available to instantiate loader")), + "no componentcontext available to instantiate loader"), Reference< XInterface > () ); } } @@ -1820,7 +1820,7 @@ void ImplementationRegistration::doRegister( else { throw CannotRegisterImplementationException( - OUString( RTL_CONSTASCII_USTRINGPARAM( "ImplementationRegistration::doRegistration() component registration signaled failure" ) ), + OUString( "ImplementationRegistration::doRegistration() component registration signaled failure" ), Reference< XInterface > () ); } diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 8ec0c9ae00c9..9c2a2ab3387d 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -69,13 +69,13 @@ namespace stoc_inv static Sequence< OUString > inv_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); + seqNames.getArray()[0] = OUString(SERVICENAME); return seqNames; } static OUString inv_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } // TODO: Zentral implementieren @@ -601,7 +601,7 @@ void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value ) catch (const Exception & exc) { throw InvocationTargetException( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception occurred in setValue(): ") ) + + OUString( "exception occurred in setValue(): " ) + exc.Message, Reference< XInterface >(), makeAny( exc /* though sliced */ ) ); } } @@ -912,7 +912,7 @@ InvocationInfo SAL_CALL Invocation_Impl::getInfoForName( const OUString& aName, if( !bFound ) { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("Unknown name, getExactName() failed!") ), + OUString( "Unknown name, getExactName() failed!" ), (XWeak *)(OWeakObject *)this, 0 ); } return aRetInfo; diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index f0f23d14cc0a..ad7dbecb8125 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -63,13 +63,13 @@ static Sequence< OUString > invadp_getSupportedServiceNames() { Sequence< OUString > seqNames(1); seqNames.getArray()[0] = - OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); + OUString(SERVICENAME); return seqNames; } static OUString invadp_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } struct hash_ptr diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index d97278d9c684..dc68d02597d7 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -135,9 +135,9 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL // get a java vm, where we can create a loader css::uno::Reference<XJavaVM> javaVM_xJavaVM( m_xComponentContext->getValueByName( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "/singletons/" - "com.sun.star.java.theJavaVirtualMachine"))), + "com.sun.star.java.theJavaVirtualMachine")), UNO_QUERY_THROW); // Use the special protocol of XJavaVM.getJavaVM: If the passed in @@ -227,7 +227,7 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL "javaloader error - no Java environment available"), css::uno::Reference<XInterface>()); // why is there no convinient contructor? - OUString sCppu_current_lb_name(RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME)); + OUString sCppu_current_lb_name(CPPU_CURRENT_LANGUAGE_BINDING_NAME); uno_getEnvironment(&pUno_environment, sCppu_current_lb_name.pData, NULL); if(!pUno_environment) throw RuntimeException(OUString( @@ -267,9 +267,9 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) { throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "jvmaccess::VirtualMachine::AttachGuard" - "::CreationException")),0); + "::CreationException"),0); } // set the service manager at the javaloader diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 78e67e9de75d..8d3da57e367c 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -636,13 +636,12 @@ JavaVirtualMachine::initialize(css::uno::Sequence< css::uno::Any > const & if (!m_xUnoVirtualMachine.is()) { throw css::lang::IllegalArgumentException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "sequence of exactly one any containing either (a) a" " com.sun.star.beans.NamedValue with Name" " \"UnoVirtualMachine\" and Value a hyper representing a" " non-null pointer to a jvmaccess:UnoVirtualMachine, or (b)" " a hyper representing a non-null pointer to a" - " jvmaccess::VirtualMachine required")), + " jvmaccess::VirtualMachine required"), static_cast< cppu::OWeakObject * >(this), 0); } m_xVirtualMachine = m_xUnoVirtualMachine->getVirtualMachine(); @@ -787,9 +786,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) //Please install a JRE and restart %PRODUCTNAME. css::java::JavaNotFoundException exc( OUString( - RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::getJavaVM failed because" - " No suitable JRE found!")), + " No suitable JRE found!"), static_cast< cppu::OWeakObject * >(this)); askForRetry(css::uno::makeAny(exc)); return css::uno::Any(); @@ -798,9 +796,9 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) { //An unexpected error occurred throw css::uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "[JavaVirtualMachine]:An unexpected error occurred" - " while searching for a Java!")), 0); + " while searching for a Java!"), 0); } } case JFW_E_INVALID_SETTINGS: @@ -811,9 +809,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) // you want to have used by %PRODUCTNAME. css::java::InvalidJavaSettingsException exc( OUString( - RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::getJavaVM failed because" - " Java settings have changed!")), + " Java settings have changed!"), static_cast< cppu::OWeakObject * >(this)); askForRetry(css::uno::makeAny(exc)); return css::uno::Any(); @@ -826,9 +823,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) //enable the use of a JRE now? css::java::JavaDisabledException exc( OUString( - RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::getJavaVM failed because" - " Java is disabled!")), + " Java is disabled!"), static_cast< cppu::OWeakObject * >(this)); if( ! askForRetry(css::uno::makeAny(exc))) return css::uno::Any(); @@ -868,9 +864,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) //and select it under Tools - Options - %PRODUCTNAME - Java. css::java::JavaVMCreationFailureException exc( OUString( - RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::getJavaVM failed because" - " Java is defective!")), + " Java is defective!"), static_cast< cppu::OWeakObject * >(this), 0); askForRetry(css::uno::makeAny(exc)); return css::uno::Any(); @@ -888,9 +883,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) //%PRODUCTNAME must be restarted. Please restart %PRODUCTNAME now. css::java::RestartRequiredException exc( OUString( - RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::getJavaVM failed because" - "Office must be restarted before Java can be used!")), + "Office must be restarted before Java can be used!"), static_cast< cppu::OWeakObject * >(this)); askForRetry(css::uno::makeAny(exc)); return css::uno::Any(); @@ -899,9 +893,9 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) //RuntimeException: error is somewhere in the java framework. //An unexpected error occurred throw css::uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "[JavaVirtualMachine]:An unexpected error occurred" - " while starting Java!")), 0); + " while starting Java!"), 0); } if (bStarted) @@ -929,9 +923,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) } catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) { throw css::uno::RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "jvmaccess::VirtualMachine::AttachGuard::" - "CreationException occurred")), + "CreationException occurred"), static_cast< cppu::OWeakObject * >(this)); } } @@ -940,9 +933,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) if (m_pJavaVm == 0) { throw css::uno::RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine service was initialized in a way" - " that the requested JavaVM pointer is not available")), + " that the requested JavaVM pointer is not available"), static_cast< cppu::OWeakObject * >(this)); } return css::uno::makeAny(reinterpret_cast< sal_IntPtr >(m_pJavaVm)); @@ -1010,9 +1002,9 @@ void SAL_CALL JavaVirtualMachine::registerThread() OUString(), static_cast< cppu::OWeakObject * >(this)); if (!m_xUnoVirtualMachine.is()) throw css::uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "JavaVirtualMachine::registerThread:" - " null VirtualMachine")), + " null VirtualMachine"), static_cast< cppu::OWeakObject * >(this)); GuardStack * pStack = static_cast< GuardStack * >(m_aAttachGuards.getData()); @@ -1031,9 +1023,8 @@ void SAL_CALL JavaVirtualMachine::registerThread() { throw css::uno::RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::registerThread: jvmaccess::" - "VirtualMachine::AttachGuard::CreationException")), + "VirtualMachine::AttachGuard::CreationException"), static_cast< cppu::OWeakObject * >(this)); } } @@ -1047,17 +1038,17 @@ void SAL_CALL JavaVirtualMachine::revokeThread() OUString(), static_cast< cppu::OWeakObject * >(this)); if (!m_xUnoVirtualMachine.is()) throw css::uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "JavaVirtualMachine::revokeThread:" - " null VirtualMachine")), + " null VirtualMachine"), static_cast< cppu::OWeakObject * >(this)); GuardStack * pStack = static_cast< GuardStack * >(m_aAttachGuards.getData()); if (pStack == 0 || pStack->empty()) throw css::uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "JavaVirtualMachine::revokeThread:" - " no matching registerThread")), + " no matching registerThread"), static_cast< cppu::OWeakObject * >(this)); delete pStack->top(); pStack->pop(); @@ -1329,9 +1320,9 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) { throw css::uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "jvmaccess::VirtualMachine::AttachGuard::" - "CreationException")), + "CreationException"), 0); } } diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index fb9ad064ffbf..5e65c20b11a7 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -59,13 +59,13 @@ namespace stoc_bootstrap Sequence< OUString > loader_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); + seqNames.getArray()[0] = OUString(SERVICENAME); return seqNames; } OUString loader_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } } diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index ed3ec3194676..d4473b32d921 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -51,13 +51,13 @@ namespace stoc_namingservice static Sequence< OUString > ns_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); + seqNames.getArray()[0] = OUString(SERVICENAME); return seqNames; } static OUString ns_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } struct equalOWString_Impl @@ -99,7 +99,7 @@ public: throw(::com::sun::star::uno::RuntimeException); static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static() { - OUString aStr( OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)) ); + OUString aStr( OUString(SERVICENAME) ); return Sequence< OUString >( &aStr, 1 ); } diff --git a/stoc/source/registry_tdprovider/structtypedescription.cxx b/stoc/source/registry_tdprovider/structtypedescription.cxx index a95a1802e173..b85b5f4c33d3 100644 --- a/stoc/source/registry_tdprovider/structtypedescription.cxx +++ b/stoc/source/registry_tdprovider/structtypedescription.cxx @@ -100,9 +100,8 @@ css::uno::Sequence< OUString > StructTypeDescription::getTypeParameters() { throw css::uno::RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "type parameter of polymorphic struct type template" - " not RT_ACCESS_INVALID/RT_REF_TYPE_PARAMETER")), + " not RT_ACCESS_INVALID/RT_REF_TYPE_PARAMETER"), static_cast< cppu::OWeakObject * >(this)); } parameters[i] = reader.getReferenceTypeName(i); diff --git a/stoc/source/registry_tdprovider/tdprovider.cxx b/stoc/source/registry_tdprovider/tdprovider.cxx index a0a6ba6309cc..9a739f0fc303 100644 --- a/stoc/source/registry_tdprovider/tdprovider.cxx +++ b/stoc/source/registry_tdprovider/tdprovider.cxx @@ -56,13 +56,13 @@ namespace stoc_bootstrap uno::Sequence< OUString > rdbtdp_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); + seqNames.getArray()[0] = OUString(SERVICENAME); return seqNames; } OUString rdbtdp_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } } @@ -94,9 +94,9 @@ class ProviderImpl public: TypeDescriptionManagerWrapper( ProviderImpl * pProvider ) : m_xTDMgr( pProvider->_xContext->getValueByName( - OUString( RTL_CONSTASCII_USTRINGPARAM( + OUString( "/singletons/com.sun.star.reflection." - "theTypeDescriptionManager") ) ), + "theTypeDescriptionManager" ) ), UNO_QUERY_THROW ), m_xThisProvider( pProvider ) {} diff --git a/stoc/source/registry_tdprovider/tdservice.cxx b/stoc/source/registry_tdprovider/tdservice.cxx index 9dda6bd54d08..926e31ad0fa1 100644 --- a/stoc/source/registry_tdprovider/tdservice.cxx +++ b/stoc/source/registry_tdprovider/tdservice.cxx @@ -374,9 +374,8 @@ void ServiceTypeDescriptionImpl::getReferences() || aReader.getFieldCount() != 0 ) throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "Service is single-interface--based but also has" - " references and/or properties" ) ), + " references and/or properties" ), static_cast< OWeakObject * >( this ) ); Reference< XTypeDescription > ifc; try @@ -395,9 +394,8 @@ void ServiceTypeDescriptionImpl::getReferences() if (resolveTypedefs(ifc)->getTypeClass() != TypeClass_INTERFACE) { throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "Single-interface--based service is not based on" - " interface type" ) ), + " interface type" ), static_cast< OWeakObject * >( this ) ); } MutexGuard guard(getMutex()); @@ -440,9 +438,8 @@ void ServiceTypeDescriptionImpl::getReferences() { throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.container." - "NoSuchElementException: " ) ) + "NoSuchElementException: " ) + e.Message, static_cast< OWeakObject * >( this ) ); } @@ -483,9 +480,8 @@ void ServiceTypeDescriptionImpl::getReferences() { throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.container." - "NoSuchElementException: " ) ) + "NoSuchElementException: " ) + e.Message, static_cast< OWeakObject * >( this ) ); } @@ -497,9 +493,8 @@ void ServiceTypeDescriptionImpl::getReferences() if ( !( aTypeDesc >>= aOptionalInterfaces[ nOI ] ) ) throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "Service 'supports' is not an" - " interface" ) ), + " interface" ), static_cast< OWeakObject * >( this ) ); nOI++; } @@ -509,9 +504,8 @@ void ServiceTypeDescriptionImpl::getReferences() if ( !( aTypeDesc >>= aMandatoryInterfaces[ nMI ] ) ) throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "Service 'supports' is not an" - " interface" ) ), + " interface" ), static_cast< OWeakObject * >( this ) ); nMI++; } diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 9486b7cd9e83..1adbf290791f 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -1010,7 +1010,7 @@ Reference< XInterface > SAL_CALL ac_create( Sequence< OUString > ac_getSupportedServiceNames() SAL_THROW(()) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME)); + aSNS.getArray()[0] = OUString(SERVICE_NAME); return aSNS; } //-------------------------------------------------------------------------------------------------- diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index 5050d27cef91..344b968c3063 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -575,7 +575,7 @@ Reference< XInterface > SAL_CALL filepolicy_create( Sequence< OUString > filepolicy_getSupportedServiceNames() SAL_THROW(()) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME)); + aSNS.getArray()[0] = OUString(SERVICE_NAME); return aSNS; } //-------------------------------------------------------------------------------------------------- diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index f59d5cf42f3b..e9bcef7a5d4d 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -272,9 +272,8 @@ css::registry::RegistryKeyType Key::getKeyType(OUString const & rKeyName) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getKeyType:" - " underlying RegistryKey::getKeyType() = ")) + + " underlying RegistryKey::getKeyType() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -305,9 +304,8 @@ css::registry::RegistryValueType Key::getValueType() default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getValueType:" - " underlying RegistryKey::getValueInfo() = ")) + + " underlying RegistryKey::getValueInfo() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -347,16 +345,14 @@ sal_Int32 Key::getLongValue() throw ( case REG_INVALID_VALUE: throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongValue:" - " underlying RegistryKey::getValue() = REG_INVALID_VALUE")), + " underlying RegistryKey::getValue() = REG_INVALID_VALUE"), static_cast< OWeakObject * >(this)); default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongValue:" - " underlying RegistryKey::getValue() = ")) + + " underlying RegistryKey::getValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -372,9 +368,8 @@ void Key::setLongValue(sal_Int32 value) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setLongValue:" - " underlying RegistryKey::setValue() = ")) + + " underlying RegistryKey::setValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -395,17 +390,15 @@ css::uno::Sequence< sal_Int32 > Key::getLongListValue() throw ( case REG_INVALID_VALUE: throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongListValue:" " underlying RegistryKey::getLongListValue() =" - " REG_INVALID_VALUE")), + " REG_INVALID_VALUE"), static_cast< OWeakObject * >(this)); default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongListValue:" - " underlying RegistryKey::getLongListValue() = ")) + + " underlying RegistryKey::getLongListValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -413,9 +406,8 @@ css::uno::Sequence< sal_Int32 > Key::getLongListValue() throw ( if (n > SAL_MAX_INT32) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongListValue:" - " underlying RegistryKey::getLongListValue() too large")), + " underlying RegistryKey::getLongListValue() too large"), static_cast< OWeakObject * >(this)); } css::uno::Sequence< sal_Int32 > value(static_cast< sal_Int32 >(n)); @@ -439,9 +431,8 @@ void Key::setLongListValue(css::uno::Sequence< sal_Int32 > const & seqValue) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setLongListValue:" - " underlying RegistryKey::setLongListValue() = ")) + + " underlying RegistryKey::setLongListValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -458,18 +449,16 @@ OUString Key::getAsciiValue() throw ( if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" - " underlying RegistryKey::getValueInfo() = ")) + + " underlying RegistryKey::getValueInfo() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } if (type != RG_VALUETYPE_STRING) { throw css::registry::InvalidValueException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" - " underlying RegistryKey type = ")) + + " underlying RegistryKey type = ") + OUString::number(type)), static_cast< OWeakObject * >(this)); } @@ -477,18 +466,16 @@ OUString Key::getAsciiValue() throw ( if (size == 0) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" " underlying RegistryKey size 0 cannot happen due to" - " design error")), + " design error"), static_cast< OWeakObject * >(this)); } if (size > SAL_MAX_INT32) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" - " underlying RegistryKey size too large")), + " underlying RegistryKey size too large"), static_cast< OWeakObject * >(this)); } std::vector< char > list(size); @@ -496,19 +483,17 @@ OUString Key::getAsciiValue() throw ( if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" - " underlying RegistryKey::getValue() = ")) + + " underlying RegistryKey::getValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } if (list[size - 1] != '\0') { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" " underlying RegistryKey value must be null-terminated due" - " to design error")), + " to design error"), static_cast< OWeakObject * >(this)); } OUString value; @@ -521,9 +506,8 @@ OUString Key::getAsciiValue() throw ( { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" - " underlying RegistryKey not UTF-8")), + " underlying RegistryKey not UTF-8"), static_cast< OWeakObject * >(this)); } return value; @@ -541,9 +525,8 @@ void Key::setAsciiValue(OUString const & value) { throw css::uno::RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setAsciiValue:" - " value not UTF-16")), + " value not UTF-16"), static_cast< OWeakObject * >(this)); } RegError err = key_.setValue( @@ -553,9 +536,8 @@ void Key::setAsciiValue(OUString const & value) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setAsciiValue:" - " underlying RegistryKey::setValue() = ")) + + " underlying RegistryKey::setValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -576,18 +558,16 @@ css::uno::Sequence< OUString > Key::getAsciiListValue() throw ( case REG_INVALID_VALUE: throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getAsciiListValue: underlying" - " RegistryKey::getStringListValue() = REG_INVALID_VALUE")), + " RegistryKey::getStringListValue() = REG_INVALID_VALUE"), static_cast< OWeakObject * >(this)); default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getAsciiListValue: underlying" - " RegistryKey::getStringListValue() = ")) + + " RegistryKey::getStringListValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -595,10 +575,9 @@ css::uno::Sequence< OUString > Key::getAsciiListValue() throw ( if (n > SAL_MAX_INT32) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getAsciiListValue: underlying" - " RegistryKey::getStringListValue() too large")), + " RegistryKey::getStringListValue() too large"), static_cast< OWeakObject * >(this)); } css::uno::Sequence< OUString > value(static_cast< sal_Int32 >(n)); @@ -614,10 +593,9 @@ css::uno::Sequence< OUString > Key::getAsciiListValue() throw ( { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getAsciiListValue: underlying RegistryKey not" - " UTF-8")), + " UTF-8"), static_cast< OWeakObject * >(this)); } } @@ -639,9 +617,8 @@ void Key::setAsciiListValue( { throw css::uno::RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" - " setAsciiListValue: value not UTF-16")), + " setAsciiListValue: value not UTF-16"), static_cast< OWeakObject * >(this)); } list.push_back(utf8); @@ -658,10 +635,9 @@ void Key::setAsciiListValue( if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " setAsciiListValue: underlying" - " RegistryKey::setStringListValue() = ")) + + " RegistryKey::setStringListValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -678,18 +654,16 @@ OUString Key::getStringValue() throw ( if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" - " underlying RegistryKey::getValueInfo() = ")) + + " underlying RegistryKey::getValueInfo() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } if (type != RG_VALUETYPE_UNICODE) { throw css::registry::InvalidValueException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" - " underlying RegistryKey type = ")) + + " underlying RegistryKey type = ") + OUString::number(type)), static_cast< OWeakObject * >(this)); } @@ -698,18 +672,16 @@ OUString Key::getStringValue() throw ( if (size == 0 || (size & 1) == 1) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" " underlying RegistryKey size 0 or odd cannot happen due to" - " design error")), + " design error"), static_cast< OWeakObject * >(this)); } if (size > SAL_MAX_INT32) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" - " underlying RegistryKey size too large")), + " underlying RegistryKey size too large"), static_cast< OWeakObject * >(this)); } std::vector< sal_Unicode > list(size); @@ -717,19 +689,17 @@ OUString Key::getStringValue() throw ( if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" - " underlying RegistryKey::getValue() = ")) + + " underlying RegistryKey::getValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } if (list[size/2 - 1] != 0) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" " underlying RegistryKey value must be null-terminated due" - " to design error")), + " to design error"), static_cast< OWeakObject * >(this)); } return OUString(&list[0], static_cast< sal_Int32 >(size/2 - 1)); @@ -747,9 +717,8 @@ void Key::setStringValue(OUString const & value) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setStringValue:" - " underlying RegistryKey::setValue() = ")) + + " underlying RegistryKey::setValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -770,18 +739,16 @@ css::uno::Sequence< OUString > Key::getStringListValue() throw ( case REG_INVALID_VALUE: throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getStringListValue: underlying" - " RegistryKey::getUnicodeListValue() = REG_INVALID_VALUE")), + " RegistryKey::getUnicodeListValue() = REG_INVALID_VALUE"), static_cast< OWeakObject * >(this)); default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getStringListValue: underlying" - " RegistryKey::getUnicodeListValue() = ")) + + " RegistryKey::getUnicodeListValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -789,10 +756,9 @@ css::uno::Sequence< OUString > Key::getStringListValue() throw ( if (n > SAL_MAX_INT32) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getStringListValue: underlying" - " RegistryKey::getUnicodeListValue() too large")), + " RegistryKey::getUnicodeListValue() too large"), static_cast< OWeakObject * >(this)); } css::uno::Sequence< OUString > value(static_cast< sal_Int32 >(n)); @@ -817,10 +783,9 @@ void Key::setStringListValue( if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " setStringListValue: underlying" - " RegistryKey::setUnicodeListValue() = ")) + + " RegistryKey::setUnicodeListValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -838,27 +803,24 @@ css::uno::Sequence< sal_Int8 > Key::getBinaryValue() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getBinaryValue:" - " underlying RegistryKey::getValueInfo() = ")) + + " underlying RegistryKey::getValueInfo() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } if (type != RG_VALUETYPE_BINARY) { throw css::registry::InvalidValueException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getBinaryValue:" - " underlying RegistryKey type = ")) + + " underlying RegistryKey type = ") + OUString::number(type)), static_cast< OWeakObject * >(this)); } if (size > SAL_MAX_INT32) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getBinaryValue:" - " underlying RegistryKey size too large")), + " underlying RegistryKey size too large"), static_cast< OWeakObject * >(this)); } css::uno::Sequence< sal_Int8 > value(static_cast< sal_Int32 >(size)); @@ -866,9 +828,8 @@ css::uno::Sequence< sal_Int8 > Key::getBinaryValue() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getBinaryValue:" - " underlying RegistryKey::getValue() = ")) + + " underlying RegistryKey::getValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -886,9 +847,8 @@ void Key::setBinaryValue(css::uno::Sequence< sal_Int8 > const & value) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setBinaryValue:" - " underlying RegistryKey::setValue() = ")) + + " underlying RegistryKey::setValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -909,9 +869,8 @@ css::uno::Reference< css::registry::XRegistryKey > Key::openKey( default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key openKey:" - " underlying RegistryKey::openKey() = ")) + + " underlying RegistryKey::openKey() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -932,9 +891,8 @@ css::uno::Reference< css::registry::XRegistryKey > Key::createKey( default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key createKey:" - " underlying RegistryKey::createKey() = ")) + + " underlying RegistryKey::createKey() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -948,9 +906,8 @@ void Key::closeKey() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key closeKey:" - " underlying RegistryKey::closeKey() = ")) + + " underlying RegistryKey::closeKey() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -964,9 +921,8 @@ void Key::deleteKey(OUString const & rKeyName) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key deleteKey:" - " underlying RegistryKey::deleteKey() = ")) + + " underlying RegistryKey::deleteKey() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -982,9 +938,8 @@ Key::openKeys() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key openKeys:" - " underlying RegistryKey::openSubKeys() = ")) + + " underlying RegistryKey::openSubKeys() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -992,9 +947,8 @@ Key::openKeys() if (n > SAL_MAX_INT32) { throw css::registry::InvalidRegistryException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getKeyNames:" - " underlying RegistryKey::getKeyNames() too large")), + " underlying RegistryKey::getKeyNames() too large"), static_cast< OWeakObject * >(this)); } css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > > @@ -1015,9 +969,8 @@ css::uno::Sequence< OUString > Key::getKeyNames() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getKeyNames:" - " underlying RegistryKey::getKeyNames() = ")) + + " underlying RegistryKey::getKeyNames() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1025,9 +978,8 @@ css::uno::Sequence< OUString > Key::getKeyNames() if (n > SAL_MAX_INT32) { throw css::registry::InvalidRegistryException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getKeyNames:" - " underlying RegistryKey::getKeyNames() too large")), + " underlying RegistryKey::getKeyNames() too large"), static_cast< OWeakObject * >(this)); } css::uno::Sequence< OUString > names(static_cast< sal_Int32 >(n)); @@ -1050,9 +1002,8 @@ sal_Bool Key::createLink( case REG_DETECT_RECURSION: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key createLink:" - " underlying RegistryKey::createLink() = ")) + + " underlying RegistryKey::createLink() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); default: @@ -1068,9 +1019,8 @@ void Key::deleteLink(OUString const & rLinkName) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key deleteLink:" - " underlying RegistryKey::deleteLink() = ")) + + " underlying RegistryKey::deleteLink() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1085,9 +1035,8 @@ OUString Key::getLinkTarget(OUString const & rLinkName) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLinkTarget:" - " underlying RegistryKey::getLinkTarget() = ")) + + " underlying RegistryKey::getLinkTarget() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1103,9 +1052,8 @@ OUString Key::getResolvedName(OUString const & aKeyName) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getResolvedName:" - " underlying RegistryKey::getResolvedName() = ")) + + " underlying RegistryKey::getResolvedName() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1134,8 +1082,7 @@ void SimpleRegistry::open( "com.sun.star.registry.SimpleRegistry.open(") + rURL + OUString( - RTL_CONSTASCII_USTRINGPARAM( - "): underlying Registry::open/create() = ")) + + "): underlying Registry::open/create() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1154,9 +1101,8 @@ void SimpleRegistry::close() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.close:" - " underlying Registry::close() = ")) + + " underlying Registry::close() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1170,9 +1116,8 @@ void SimpleRegistry::destroy() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.destroy:" - " underlying Registry::destroy() = ")) + + " underlying Registry::destroy() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1187,9 +1132,8 @@ css::uno::Reference< css::registry::XRegistryKey > SimpleRegistry::getRootKey() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.getRootKey:" - " underlying Registry::getRootKey() = ")) + + " underlying Registry::getRootKey() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1222,16 +1166,14 @@ void SimpleRegistry::mergeKey( case REG_MERGE_ERROR: throw css::registry::MergeConflictException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.mergeKey:" - " underlying Registry::mergeKey() = REG_MERGE_ERROR")), + " underlying Registry::mergeKey() = REG_MERGE_ERROR"), static_cast< cppu::OWeakObject * >(this)); default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.mergeKey:" - " underlying Registry::getRootKey/mergeKey() = ")) + + " underlying Registry::getRootKey/mergeKey() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index bc8b3cac5d4f..799bae3f8a7e 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -54,13 +54,13 @@ namespace stoc_services Sequence< OUString > tcv_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); + seqNames.getArray()[0] = OUString(SERVICENAME); return seqNames; } OUString tcv_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } } diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index c85de6f330f0..70e92aa504e4 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -68,7 +68,7 @@ uno::Sequence< OUString > SAL_CALL SvFilterOptionsDialog_getSupportedServiceName { uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) ); + pArray[0] = OUString( SERVICE_NAME ); return aRet; } #undef SERVICE_NAME diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 0d8ce74af190..88086ef26fad 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -144,20 +144,20 @@ SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjD static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObjDesc ) { - const OUString aChar( RTL_CONSTASCII_USTRINGPARAM( "\"" )); + const OUString aChar( "\"" ); const OUString aClassName( rObjDesc.maClassName.GetHexName() ); OUString aParams; if( !aClassName.isEmpty() ) { - aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";classname=\"" )); + aParams += OUString( ";classname=\"" ); aParams += aClassName; aParams += aChar; } if( !rObjDesc.maTypeName.isEmpty() ) { - aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";typename=\"" )); + aParams += OUString( ";typename=\"" ); aParams += rObjDesc.maTypeName; aParams += aChar; } @@ -180,28 +180,28 @@ static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObj pToAccept[nChar] = sal_True; } - aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";displayname=\"" )); + aParams += OUString( ";displayname=\"" ); aParams += ::rtl::Uri::encode( rObjDesc.maDisplayName, pToAccept, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); aParams += aChar; } - aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";viewaspect=\"" )); + aParams += OUString( ";viewaspect=\"" ); aParams += OUString::number( rObjDesc.mnViewAspect ); aParams += aChar; - aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";width=\"" )); + aParams += OUString( ";width=\"" ); aParams += OUString::valueOf( rObjDesc.maSize.Width() ); aParams += aChar; - aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";height=\"" )); + aParams += OUString( ";height=\"" ); aParams += OUString::valueOf( rObjDesc.maSize.Height() ); aParams += aChar; - aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";posx=\"" )); + aParams += OUString( ";posx=\"" ); aParams += OUString::valueOf( rObjDesc.maDragStartPos.X() ); aParams += aChar; - aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";posy=\"" )); + aParams += OUString( ";posy=\"" ); aParams += OUString::valueOf( rObjDesc.maDragStartPos.X() ); aParams += aChar; diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index 5ceaa94cc976..ad63ad97f717 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -253,7 +253,7 @@ ContextMenuHelper::ContextMenuHelper( const uno::Reference< frame::XFrame >& xFrame, bool bAutoRefresh ) : m_xWeakFrame( xFrame ), - m_aSelf( RTL_CONSTASCII_USTRINGPARAM( "_self" )), + m_aSelf( "_self" ), m_bAutoRefresh( bAutoRefresh ), m_bUICfgMgrAssociated( false ) { diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index 0f967fe45709..d5c5240db20e 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -45,13 +45,13 @@ const sal_Char sAPI_SvDetachedEventDescriptor[] = "SvDetachedEventDescriptor"; // SvBaseEventDescriptor::SvBaseEventDescriptor( const SvEventDescription* pSupportedMacroItems ) : - sEventType(RTL_CONSTASCII_USTRINGPARAM("EventType")), - sMacroName(RTL_CONSTASCII_USTRINGPARAM("MacroName")), - sLibrary(RTL_CONSTASCII_USTRINGPARAM("Library")), - sStarBasic(RTL_CONSTASCII_USTRINGPARAM("StarBasic")), - sJavaScript(RTL_CONSTASCII_USTRINGPARAM("JavaScript")), - sScript(RTL_CONSTASCII_USTRINGPARAM("Script")), - sNone(RTL_CONSTASCII_USTRINGPARAM("None")), + sEventType("EventType"), + sMacroName("MacroName"), + sLibrary("Library"), + sStarBasic("StarBasic"), + sJavaScript("JavaScript"), + sScript("Script"), + sNone("None"), sServiceName(RTL_CONSTASCII_USTRINGPARAM(sAPI_ServiceName)), sEmpty(), mpSupportedMacroItems(pSupportedMacroItems), diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index c37e17b013d7..f74e938c84e6 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1606,7 +1606,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm if(seqCoordinates1 == seqCoordinates2) bIsDefaultPath = true; - const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) ); + const rtl::OUString sType( "Type" ); rtl::OUString sShpType; SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)(const SdrCustomShapeGeometryItem&)pCustomShapeObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); Any* pAny = rGeometryItem.GetPropertyValueByName( sType ); @@ -1630,7 +1630,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm fWidth = nCoordWidth/2; fHeight = nCoordHeight/2; - const rtl::OUString sViewBox( RTL_CONSTASCII_USTRINGPARAM ( "ViewBox" ) ); + const rtl::OUString sViewBox( "ViewBox" ); const Any* pViewBox = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sViewBox ); com::sun::star::awt::Rectangle aViewBox; if ( pViewBox && (*pViewBox >>= aViewBox ) ) diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 71986a62782f..e41f41031822 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -824,9 +824,9 @@ namespace svxform lcl_ReplaceString() : lcl_ResourceString(), - m_sDoc_API( RTL_CONSTASCII_USTRINGPARAM("all") ), - m_sInstance_API( RTL_CONSTASCII_USTRINGPARAM("instance") ), - m_sNone_API( RTL_CONSTASCII_USTRINGPARAM("none") ) + m_sDoc_API( "all" ), + m_sInstance_API( "instance" ), + m_sNone_API( "none" ) { init(); } @@ -897,9 +897,9 @@ namespace svxform lcl_MethodString() : lcl_ResourceString(), - m_sPost_API( RTL_CONSTASCII_USTRINGPARAM("post") ), - m_sPut_API( RTL_CONSTASCII_USTRINGPARAM("put") ), - m_sGet_API( RTL_CONSTASCII_USTRINGPARAM("get") ) + m_sPost_API( "post" ), + m_sPut_API( "put" ), + m_sGet_API( "get" ) { init(); } diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 88e42ef86866..eebc4aba5749 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -115,7 +115,7 @@ namespace size_t lhsCount = m_aComponentInfo.childCount( _components.first ); size_t rhsCount = m_aComponentInfo.childCount( _components.second ); if ( lhsCount != rhsCount ) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (1)!" ) ), NULL ); + throw RuntimeException( OUString( "Found inconsistent form component hierarchies (1)!" ), NULL ); return lhsCount; } @@ -145,7 +145,7 @@ namespace Reference< XControlModel > lhsControlModel( _component.first, UNO_QUERY ); Reference< XControlModel > rhsControlModel( _component.second, UNO_QUERY ); if ( lhsControlModel.is() != rhsControlModel.is() ) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (2)!" ) ), NULL ); + throw RuntimeException( OUString( "Found inconsistent form component hierarchies (2)!" ), NULL ); if ( lhsControlModel.is() ) m_rControlModelMap[ lhsControlModel ] = rhsControlModel; diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index 94d88e8562fd..c45635eb137c 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -99,9 +99,9 @@ bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM case 0 : { ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( VIEWLAYOUT_PARAMS ); - aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_COLUMNS )); + aSeq[0].Name = OUString( VIEWLAYOUT_PARAM_COLUMNS ); aSeq[0].Value <<= sal_Int32( GetValue() ); - aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_BOOKMODE )); + aSeq[1].Name = OUString( VIEWLAYOUT_PARAM_BOOKMODE ); aSeq[1].Value <<= sal_Bool( mbBookMode ); rVal <<= aSeq; } diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index ef19d6dc52a3..eb04b54c04e0 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -96,13 +96,13 @@ bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM case 0 : { ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOMSLIDER_PARAMS ); - aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_CURRENTZOOM )); + aSeq[0].Name = OUString( ZOOMSLIDER_PARAM_CURRENTZOOM ); aSeq[0].Value <<= sal_Int32( GetValue() ); - aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_SNAPPINGPOINTS )); + aSeq[1].Name = OUString( ZOOMSLIDER_PARAM_SNAPPINGPOINTS ); aSeq[1].Value <<= maValues; - aSeq[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MINZOOM ) ); + aSeq[2].Name = OUString( ZOOMSLIDER_PARAM_MINZOOM ); aSeq[2].Value <<= mnMinZoom; - aSeq[3].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MAXZOOM ) ); + aSeq[3].Name = OUString( ZOOMSLIDER_PARAM_MAXZOOM ); aSeq[3].Value <<= mnMaxZoom; rVal <<= aSeq; } diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index cfd39393c855..21d42773f19c 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -178,9 +178,9 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId, pImp->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) ); pImp->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) ); - addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( STR_POSITION ))); // SID_ATTR_POSITION - addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( STR_TABLECELL ))); // SID_TABLE_CELL - addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( STR_FUNC ))); // SID_PSZ_FUNCTION + addStatusListener( OUString( STR_POSITION )); // SID_ATTR_POSITION + addStatusListener( OUString( STR_TABLECELL )); // SID_TABLE_CELL + addStatusListener( OUString( STR_FUNC )); // SID_PSZ_FUNCTION } // ----------------------------------------------------------------------- diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index a4dfefb60bf8..779ee150e477 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -60,7 +60,7 @@ static SvxBorderLine gEmptyBorder; TableLayouter::TableLayouter( const TableModelRef& xTableModel ) : mxTable( xTableModel ) , meWritingMode( WritingMode_LR_TB ) -, msSize( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ) +, msSize( "Size" ) { } diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index c3f0afcedcf5..117715d71979 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -73,7 +73,7 @@ SdrTableRtfExporter::SdrTableRtfExporter( SvStream& rStrm, SdrTableObj& rObj ) : mrStrm( rStrm ) , mrObj( rObj ) , mxTable( rObj.getTable() ) -, msSize( RTL_CONSTASCII_USTRINGPARAM("Size") ) +, msSize( "Size" ) { } diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 3ede27ad2ff5..b4ce7cde262e 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -80,8 +80,8 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( mrController( rController ) , maImgPerspective( SVX_RES( IMG_PERSPECTIVE ) ) , maImgParallel( SVX_RES( IMG_PARALLEL ) ) , - msExtrusionDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirection" ) ) , - msExtrusionProjection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionProjection" ) ) + msExtrusionDirection( ".uno:ExtrusionDirection" ) , + msExtrusionProjection( ".uno:ExtrusionProjection" ) { SetHelpId( HID_MENU_EXTRUSION_DIRECTION ); @@ -343,8 +343,8 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( , maImgDepth4( SVX_RES( IMG_DEPTH_4 ) ) , maImgDepthInfinity( SVX_RES( IMG_DEPTH_INFINITY ) ) , mfDepth( -1.0 ) - , msExtrusionDepth( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepth" ) ) - , msMetricUnit( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" ) ) + , msExtrusionDepth( ".uno:ExtrusionDepth" ) + , msMetricUnit( ".uno:MetricUnit" ) { SetHelpId( HID_MENU_EXTRUSION_DEPTH ); @@ -578,8 +578,8 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr , mbLevelEnabled( false ) , mnDirection( FROM_FRONT ) , mbDirectionEnabled( false ) -, msExtrusionLightingDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingDirection" )) -, msExtrusionLightingIntensity( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingIntensity" )) +, msExtrusionLightingDirection( ".uno:ExtrusionLightingDirection" ) +, msExtrusionLightingIntensity( ".uno:ExtrusionLightingIntensity" ) { sal_uInt16 i; for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ ) @@ -838,7 +838,7 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( , maImgSurface2( SVX_RES( IMG_MATTE ) ) , maImgSurface3( SVX_RES( IMG_PLASTIC ) ) , maImgSurface4( SVX_RES( IMG_METAL ) ) - , msExtrusionSurface( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurface" ) ) + , msExtrusionSurface( ".uno:ExtrusionSurface" ) { SetHelpId( HID_MENU_EXTRUSION_SURFACE ); SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) ); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index bf04524fda8e..03d91e727f4c 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -310,7 +310,7 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow( svt::ToolboxController& rContr , maImgAlgin3( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16 ) ) , maImgAlgin4( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16 ) ) , maImgAlgin5( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16 ) ) -, msFontworkAlignment( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkAlignment" ) ) +, msFontworkAlignment( ".uno:FontworkAlignment" ) { SetHelpId( HID_POPUP_FONTWORK_ALIGN ); SetSelectHdl( LINK( this, FontWorkAlignmentWindow, SelectHdl ) ); @@ -496,8 +496,8 @@ private: FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_CHARSPACING )) , mrController( rController ) -, msFontworkCharacterSpacing( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacing" ) ) -, msFontworkKernCharacterPairs( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkKernCharacterPairs" ) ) +, msFontworkCharacterSpacing( ".uno:FontworkCharacterSpacing" ) +, msFontworkKernCharacterPairs( ".uno:FontworkKernCharacterPairs" ) { SetHelpId( HID_POPUP_FONTWORK_CHARSPACE ); SetSelectHdl( LINK( this, FontWorkCharacterSpacingWindow, SelectHdl ) ); diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx index 7e06ceeec637..b566c1f8ef64 100644 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -42,8 +42,8 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlAlign, SfxAllEnumItem); SvxTbxCtlAlign::SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) - , m_aSubTbName( RTL_CONSTASCII_USTRINGPARAM( "alignmentbar" )) - , m_aSubTbResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/alignmentbar" )) + , m_aSubTbName( "alignmentbar" ) + , m_aSubTbResName( "private:resource/toolbar/alignmentbar" ) { rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) ); rTbx.Invalidate(); diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index 95269bed34da..2453f4593d72 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -47,7 +47,7 @@ SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx SfxToolBoxControl( nSlotId, nId, rTbx ), - m_sToolboxName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/drawbar" ) ) + m_sToolboxName( "private:resource/toolbar/drawbar" ) { rTbx.SetItemBits( nId, TIB_CHECKABLE | rTbx.GetItemBits( nId ) ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 656c06a3b2ba..5ea698be0261 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -482,7 +482,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); - Any aAny( aLngCfg.GetProperty( OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )) ) ); + Any aAny( aLngCfg.GetProperty( OUString( UPN_IS_REVERSE_MAPPING ) ) ); if( aAny >>= bValue ) m_aCB_Reverse.Check( bValue ); @@ -831,7 +831,7 @@ short ChineseDictionaryDialog::Execute() SvtLinguConfig aLngCfg; Any aAny; aAny <<= sal_Bool( !!m_aCB_Reverse.IsChecked() ); - aLngCfg.SetProperty( OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )), aAny ); + aLngCfg.SetProperty( OUString( UPN_IS_REVERSE_MAPPING ), aAny ); m_aCT_DictionaryToSimplified.save(); m_aCT_DictionaryToTraditional.save(); diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 1eb1d74c50ac..c9b9603fae67 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -668,7 +668,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XP // SvxUnoXPropertyTable uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const throw() { - OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); + OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX); const GraphicObject& rGraphicObject(((XBitmapEntry*)pEntry)->GetGraphicObject()); aURL += OStringToOUString(rGraphicObject.GetUniqueID(), RTL_TEXTENCODING_ASCII_US); diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 71d40cb3f733..b2fd24f7e75b 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1414,7 +1414,7 @@ comphelper::PropertySetInfo* SvxPropertySetInfoPool::getOrCreate( sal_Int32 nSer break; case SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER: mpInfos[SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER]->add( ImplGetSvxDrawingDefaultsPropertyMap() ); - mpInfos[SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER]->remove( OUString( RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION ) ) ); + mpInfos[SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER]->remove( OUString( UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION ) ); // OD 13.10.2003 #i18732# - add property map for writer item 'IsFollowingTextFlow' mpInfos[SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER]->add( ImplGetAdditionalWriterDrawingDefaultsPropertyMap() ); break; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index d47a69d5347d..e96f7e12b560 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1647,7 +1647,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte { sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut(); const GraphicObject& rGrafObj = static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphicObject(true); - OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); + OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX); aURL += OStringToOUString(rGrafObj.GetUniqueID(), RTL_TEXTENCODING_ASCII_US); rValue <<= aURL; if ( bSwapped ) @@ -1662,7 +1662,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte if(pGrafObj) { - OUString aURL(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); + OUString aURL(UNO_NAME_GRAPHOBJ_URLPREFIX); aURL += OStringToOUString(pGrafObj->GetUniqueID(), RTL_TEXTENCODING_ASCII_US); rValue <<= aURL; } diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 02839abbe05e..71447f942c61 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -135,8 +135,8 @@ struct OUStringLess DBG_NAME(SvXMLEmbeddedObjectHelper) SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() : WeakComponentImplHelper2< XEmbeddedObjectResolver, XNameAccess >( maMutex ), - maReplacementGraphicsContainerStorageName( RTL_CONSTASCII_USTRINGPARAM(XML_CONTAINERSTORAGE_NAME) ), - maReplacementGraphicsContainerStorageName60( RTL_CONSTASCII_USTRINGPARAM(XML_CONTAINERSTORAGE_NAME_60) ), + maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ), + maReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 ), mpDocPersist( 0 ), meCreateMode( EMBEDDEDOBJECTHELPER_MODE_READ ), mpStreamMap( 0 ) @@ -146,8 +146,8 @@ SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() : SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper( ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode ) : WeakComponentImplHelper2< XEmbeddedObjectResolver, XNameAccess >( maMutex ), - maReplacementGraphicsContainerStorageName( RTL_CONSTASCII_USTRINGPARAM(XML_CONTAINERSTORAGE_NAME) ), - maReplacementGraphicsContainerStorageName60( RTL_CONSTASCII_USTRINGPARAM(XML_CONTAINERSTORAGE_NAME_60) ), + maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ), + maReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 ), mpDocPersist( 0 ), meCreateMode( EMBEDDEDOBJECTHELPER_MODE_READ ), mpStreamMap( 0 ) @@ -482,7 +482,7 @@ OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL( } ImplReadObject( aContainerStorageName, aObjectStorageName, pClassId, pOut ? pOut->GetStream() : 0 ); - sRetURL = OUString( RTL_CONSTASCII_USTRINGPARAM(XML_EMBEDDEDOBJECT_URL_BASE) ); + sRetURL = OUString( XML_EMBEDDEDOBJECT_URL_BASE ); sRetURL += aObjectStorageName; if( pOut ) diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index b29dda0dce75..8a6be6b8737a 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -519,8 +519,8 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe if( nMemberId == MID_GRAFURL || nMemberId == 0 ) { - aURL = OUString(RTL_CONSTASCII_USTRINGPARAM( - UNO_NAME_GRAPHOBJ_URLPREFIX)); + aURL = OUString( + UNO_NAME_GRAPHOBJ_URLPREFIX); aURL += OStringToOUString( GetGraphicObject().GetUniqueID(), RTL_TEXTENCODING_ASCII_US); diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 09e68deeccd9..7dff0bdf485c 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -785,12 +785,12 @@ namespace { { const IFieldmark::parameter_map_t* const pParameters = pBM->GetParameters(); sal_Int32 nCurrentIdx = 0; - const IFieldmark::parameter_map_t::const_iterator pResult = pParameters->find(OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_RESULT))); + const IFieldmark::parameter_map_t::const_iterator pResult = pParameters->find(OUString(ODF_FORMDROPDOWN_RESULT)); if(pResult != pParameters->end()) pResult->second >>= nCurrentIdx; if(io_pCurrentText) { - const IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_LISTENTRY))); + const IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(OUString(ODF_FORMDROPDOWN_LISTENTRY)); if(pListEntries != pParameters->end()) { uno::Sequence< OUString > vListEntries; diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index dd832ddb14eb..856c2f8a7771 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -666,7 +666,7 @@ SwXFieldmark::CreateXFieldmark(SwDoc & rDoc, ::sw::mark::IMark & rMark) SwXFieldmark::getCheckboxFieldmark() { ::sw::mark::ICheckboxFieldmark* pCheckboxFm = NULL; - if ( getFieldType() == OUString( RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX) ) ) + if ( getFieldType() == OUString( ODF_FORMCHECKBOX ) ) { // evil #TODO #FIXME casting away the const-ness pCheckboxFm = const_cast<sw::mark::ICheckboxFieldmark*>(dynamic_cast< const ::sw::mark::ICheckboxFieldmark* >( GetBookmark())); diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 54a3c1aeb2fc..4dcb59b94e8c 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -1974,8 +1974,8 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark( if (!pTxtAttr) { - throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "SwXDocumentIndexMark::InsertTOXMark(): cannot insert attribute")), + throw uno::RuntimeException(OUString( + "SwXDocumentIndexMark::InsertTOXMark(): cannot insert attribute"), 0); } diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index 7870c3886200..ddaad553a083 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -139,9 +139,9 @@ uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursor(void) // no content node outside of a table could be found, and therefore we // except. uno::RuntimeException aExcept; - aExcept.Message = OUString( RTL_CONSTASCII_USTRINGPARAM( + aExcept.Message = OUString( "No content node found that is inside this change section " - "but outside of a table" ) ); + "but outside of a table" ); throw aExcept; } diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 3e034316af54..6f2e620b54fe 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -267,8 +267,8 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam, if (!pTxtAttr) { - throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( - "SwXReferenceMark::InsertRefMark(): cannot insert attribute")), 0); + throw uno::RuntimeException(OUString( + "SwXReferenceMark::InsertRefMark(): cannot insert attribute"), 0); } m_pMarkFmt = &pTxtAttr->GetRefMark(); diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index 00a59c7baa68..b4f85a540016 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -268,9 +268,9 @@ XMLRedlineImportHelper::XMLRedlineImportHelper( sInsertion( GetXMLToken( XML_INSERTION )), sDeletion( GetXMLToken( XML_DELETION )), sFormatChange( GetXMLToken( XML_FORMAT_CHANGE )), - sShowChanges(RTL_CONSTASCII_USTRINGPARAM("ShowChanges")), - sRecordChanges(RTL_CONSTASCII_USTRINGPARAM("RecordChanges")), - sRedlineProtectionKey(RTL_CONSTASCII_USTRINGPARAM("RedlineProtectionKey")), + sShowChanges("ShowChanges"), + sRecordChanges("RecordChanges"), + sRedlineProtectionKey("RedlineProtectionKey"), aRedlineMap(), bIgnoreRedlines(bNoRedlinesPlease), xModelPropertySet(rModel), diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 8012a86e36bc..e12b3f3631bd 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -88,9 +88,9 @@ SwXMLExport::SwXMLExport( bBlock( sal_False ), bShowProgress( sal_True ), doc( NULL ), - sNumberFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")), - sIsProtected(RTL_CONSTASCII_USTRINGPARAM("IsProtected")), - sCell(RTL_CONSTASCII_USTRINGPARAM("Cell")) + sNumberFormat("NumberFormat"), + sIsProtected("IsProtected"), + sCell("Cell") { _InitItemExport(); } diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index ee13b1f55f08..fe7edfb84331 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -181,9 +181,9 @@ SwXMLTextParagraphExport::SwXMLTextParagraphExport( SwXMLExport& rExp, SvXMLAutoStylePoolP& _rAutoStylePool ) : XMLTextParagraphExport( rExp, _rAutoStylePool ), - sTextTable( RTL_CONSTASCII_USTRINGPARAM( "TextTable" ) ), - sEmbeddedObjectProtocol( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.EmbeddedObject:" ) ), - sGraphicObjectProtocol( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:" ) ), + sTextTable( "TextTable" ), + sEmbeddedObjectProtocol( "vnd.sun.star.EmbeddedObject:" ), + sGraphicObjectProtocol( "vnd.sun.star.GraphicObject:" ), aAppletClassId( SO3_APPLET_CLASSID ), aPluginClassId( SO3_PLUGIN_CLASSID ), aIFrameClassId( SO3_IFRAME_CLASSID ), diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index df07c221ab6c..6ccf91da693f 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -842,7 +842,7 @@ void SwDocShell::Execute(SfxRequest& rReq) bMerge = 0 != (nFlags&SFX_MERGE_STYLES); aOpt.SetMerge( !bMerge ); - SetError( LoadStylesFromFile( aFileName, aOpt, sal_False ), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError( LoadStylesFromFile( aFileName, aOpt, sal_False ), OUString( OSL_LOG_PREFIX )); if ( !GetError() ) rReq.Done(); } diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index fba0504f1a09..9cf486cf4129 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -569,7 +569,7 @@ sal_Bool SwDocShell::Load( SfxMedium& rMedium ) UpdateFontList(); InitDraw(); - SetError( nErr, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( nErr, OUString( OSL_LOG_PREFIX ) ); bRet = !IsError( nErr ); if ( bRet && !pDoc->IsInLoadAsynchron() && @@ -620,7 +620,7 @@ sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium ) OSL_FAIL("Code removed!"); } - SetError( nErr, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( nErr, OUString( OSL_LOG_PREFIX ) ); bRet = !IsError( nErr ); } while( false ); diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx index 951e791228d5..a87f40e89e4d 100644 --- a/sw/source/ui/config/caption.cxx +++ b/sw/source/ui/config/caption.cxx @@ -27,7 +27,7 @@ InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleI bUseCaption(sal_False), eObjType(eType), nNumType(SVX_NUM_ARABIC), - sNumberSeparator(RTL_CONSTASCII_USTRINGPARAM((". "))), + sNumberSeparator((". ")), nPos(1), nLevel(0), sSeparator( OUString(": ") ), diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 0356031a2a06..09bb78e3834f 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -150,7 +150,7 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bo } SwViewOption::SwViewOption() : - sSymbolFont( RTL_CONSTASCII_USTRINGPARAM( "symbol" ) ), + sSymbolFont( "symbol" ), aRetoucheColor( COL_TRANSPARENT ), mnViewLayoutColumns( 0 ), nPagePrevRow( 1 ), diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx index 14cce3b67a91..f1db23bdb482 100644 --- a/sw/source/ui/dbui/swdbtoolsclient.cxx +++ b/sw/source/ui/dbui/swdbtoolsclient.cxx @@ -104,7 +104,7 @@ void SwDbtoolsClient::registerClient() OSL_ENSURE(NULL == getDbToolsClientFactoryFunction(), "SwDbtoolsClient::registerClient: inconsistence: already have a factory function!"); #ifndef DISABLE_DYNLOADING - const OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY("dbtools"))); + const OUString sModuleName(SVLIBRARY("dbtools")); // load the dbtools library getDbToolsClientModule() = osl_loadModuleRelative( diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index 301e84da7232..d495848fd42a 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -1028,8 +1028,8 @@ const struct SvEventDescription aAutotextEvents[] = SwAutoTextEventDescriptor::SwAutoTextEventDescriptor( SwXAutoTextEntry& rAutoText ) : SvBaseEventDescriptor(aAutotextEvents), - sSwAutoTextEventDescriptor(RTL_CONSTASCII_USTRINGPARAM( - "SwAutoTextEventDescriptor")), + sSwAutoTextEventDescriptor( + "SwAutoTextEventDescriptor"), rAutoTextEntry(rAutoText) { } diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index d49436b31823..1d502ca092ed 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -1798,15 +1798,15 @@ Sequence< OUString > SwXTextDocument::getSupportedServiceNames(void) throw( Runt Sequence< OUString > aRet (3); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( ( "com.sun.star.document.OfficeDocument" ) ) ); - pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( ( "com.sun.star.text.GenericTextDocument" ) ) ); + pArray[0] = OUString ( ( "com.sun.star.document.OfficeDocument" ) ); + pArray[1] = OUString ( ( "com.sun.star.text.GenericTextDocument" ) ); if (bTextDoc) - pArray[2] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( ( "com.sun.star.text.TextDocument" ) ) ); + pArray[2] = OUString ( ( "com.sun.star.text.TextDocument" ) ); else if (bWebDoc) - pArray[2] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( ( "com.sun.star.text.WebDocument" ) ) ); + pArray[2] = OUString ( ( "com.sun.star.text.WebDocument" ) ); else if (bGlobalDoc) - pArray[2] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( ( "com.sun.star.text.GlobalDocument" ) ) ); + pArray[2] = OUString ( ( "com.sun.star.text.GlobalDocument" ) ); return aRet; } diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx index 1d6140f75ab7..3dfc5d88c447 100644 --- a/sw/source/ui/vba/vbarows.cxx +++ b/sw/source/ui/vba/vbarows.cxx @@ -261,9 +261,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE { throw uno::RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "Pb with width, in SwVbaRows::setIndentWithAdjustProportional (nNewWidth <= 0) || (nWidth <= 0)" - ) ), uno::Reference< uno::XInterface >() ); diff --git a/test/source/container/xnamecontainer.cxx b/test/source/container/xnamecontainer.cxx index 98fdf85c6857..8682f2cadbb8 100644 --- a/test/source/container/xnamecontainer.cxx +++ b/test/source/container/xnamecontainer.cxx @@ -19,7 +19,7 @@ using namespace css::uno; namespace apitest { -XNameContainer::XNameContainer(): maNameToRemove(RTL_CONSTASCII_USTRINGPARAM("XNameContainer")) +XNameContainer::XNameContainer(): maNameToRemove("XNameContainer") { } diff --git a/test/source/sheet/xnamedranges.cxx b/test/source/sheet/xnamedranges.cxx index facbe8fd211f..41295b831392 100644 --- a/test/source/sheet/xnamedranges.cxx +++ b/test/source/sheet/xnamedranges.cxx @@ -36,7 +36,7 @@ using namespace css::uno; namespace apitest { XNamedRanges::XNamedRanges(): - maNameToRemove(RTL_CONSTASCII_USTRINGPARAM("initial1")) + maNameToRemove("initial1") { } diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx index 161cba5e610f..d9d78b600060 100644 --- a/test/source/sheet/xspreadsheets2.cxx +++ b/test/source/sheet/xspreadsheets2.cxx @@ -40,9 +40,9 @@ using namespace css::uno; namespace apitest { XSpreadsheets2::XSpreadsheets2(): - aSrcSheetName(RTL_CONSTASCII_USTRINGPARAM("SheetToCopy")), - aSrcFileName(RTL_CONSTASCII_USTRINGPARAM("rangenamessrc.ods")), - aDestFileBase(RTL_CONSTASCII_USTRINGPARAM("ScNamedRangeObj.ods")) + aSrcSheetName("SheetToCopy"), + aSrcFileName("rangenamessrc.ods"), + aDestFileBase("ScNamedRangeObj.ods") { } diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 0ba8b42ac793..3c2bcda4995c 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -73,7 +73,7 @@ Sequence<T> cloneSequence(const Sequence<T>& val); //-------------------------------------------------------------------------------------------------- inline static Sequence< OUString > getSupportedServiceNames() { - OUString aName( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) ); + OUString aName( SERVICENAME ); return Sequence< OUString >( &aName, 1 ); } @@ -1092,9 +1092,9 @@ inline bool makeSurrogate( Environment aCppEnv_ano; OUString aCppEnvTypeName( - RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ); + CPPU_CURRENT_LANGUAGE_BINDING_NAME ); OUString aUnoEnvTypeName( - RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ); + UNO_LB_UNO ); // official: uno_getEnvironment( reinterpret_cast< uno_Environment ** >( &aCppEnv_official ), @@ -1147,9 +1147,9 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs ) { if (! rArgs.getLength()) { - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( + throw RuntimeException( OUString( "no test object specified!\n" - "usage : ServiceName of test object | -u unourl of test object\n" ) ), + "usage : ServiceName of test object | -u unourl of test object\n" ), Reference< XInterface >() ); } @@ -1238,7 +1238,7 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs ) OUString TestBridgeImpl::getImplementationName() throw (RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) ); + return OUString( IMPLNAME ); } //__________________________________________________________________________________________________ sal_Bool TestBridgeImpl::supportsService( const OUString & rServiceName ) @@ -1286,7 +1286,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( Reference< XInterface > xFactory( createSingleComponentFactory( bridge_test::TestBridgeImpl_create, - OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) ), + OUString( IMPLNAME ), bridge_test::getSupportedServiceNames() ) ); if (xFactory.is()) diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index 9d6d2517ceed..e9133b2faf46 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -63,7 +63,7 @@ namespace bridge_object //-------------------------------------------------------------------------------------------------- inline static Sequence< OUString > getSupportedServiceNames() { - OUString aName( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) ); + OUString aName( SERVICENAME ); return Sequence< OUString >( &aName, 1 ); } @@ -1148,7 +1148,7 @@ Reference< XCurrentContextChecker > Test_Impl::getCurrentContextChecker() OUString Test_Impl::getImplementationName() throw (RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) ); + return OUString( IMPLNAME ); } //__________________________________________________________________________________________________ sal_Bool Test_Impl::supportsService( const OUString & rServiceName ) @@ -1193,7 +1193,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( { Reference< XSingleServiceFactory > xFactory( createSingleFactory( reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), - OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) ), + OUString( IMPLNAME ), bridge_object::Test_Impl_create, bridge_object::getSupportedServiceNames() ) ); diff --git a/vcl/unx/generic/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx index 4266f1c5ca31..05a7d678ed00 100644 --- a/vcl/unx/generic/dtrans/config.cxx +++ b/vcl/unx/generic/dtrans/config.cxx @@ -67,14 +67,14 @@ sal_Int32 SelectionManager::getSelectionTimeout() */ DtransX11ConfigItem::DtransX11ConfigItem() : - ConfigItem( OUString( RTL_CONSTASCII_USTRINGPARAM( SETTINGS_CONFIGNODE ) ), + ConfigItem( OUString( SETTINGS_CONFIGNODE ), CONFIG_MODE_DELAYED_UPDATE ), m_nSelectionTimeout( 3 ) { if( IsValidConfigMgr() ) { Sequence< OUString > aKeys( 1 ); - aKeys.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SELECTION_PROPERTY ) ); + aKeys.getArray()[0] = OUString( SELECTION_PROPERTY ); Sequence< Any > aValues = GetProperties( aKeys ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "found %" SAL_PRIdINT32 " properties for %s\n", aValues.getLength(), SELECTION_PROPERTY ); diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index cfe471f4ab20..7def80fd5564 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -118,7 +118,7 @@ PrinterInfoManager::PrinterInfoManager( Type eType ) : m_eType( eType ), m_bUseIncludeFeature( false ), m_bUseJobPatch( true ), - m_aSystemDefaultPaper( RTL_CONSTASCII_USTRINGPARAM( "A4" ) ), + m_aSystemDefaultPaper( "A4" ), m_bDisableCUPS( false ) { if( eType == Default ) diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 4e3d840bb1ea..4be3b9ae8942 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -702,7 +702,7 @@ void SAL_CALL KDE4FilePicker::disposing( const lang::EventObject &rEvent ) OUString SAL_CALL KDE4FilePicker::getImplementationName() throw( uno::RuntimeException ) { - return OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME )); + return OUString( FILE_PICKER_IMPL_NAME ); } sal_Bool SAL_CALL KDE4FilePicker::supportsService( const OUString& ServiceName ) diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx index ca819c40a9e4..858e86097e18 100644 --- a/xmlreader/source/xmlreader.cxx +++ b/xmlreader/source/xmlreader.cxx @@ -251,8 +251,7 @@ bool XmlReader::skipComment() { if (i < 0) { throw css::uno::RuntimeException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( - "premature end (within comment) of ")) + + "premature end (within comment) of ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -260,8 +259,7 @@ bool XmlReader::skipComment() { if (read() != '>') { throw css::uno::RuntimeException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( - "illegal \"--\" within comment in ")) + + "illegal \"--\" within comment in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -289,8 +287,7 @@ void XmlReader::skipDocumentTypeDeclaration() { case '\0': // i.e., EOF throw css::uno::RuntimeException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( - "premature end (within DTD) of ")) + + "premature end (within DTD) of ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); case '"': @@ -301,8 +298,7 @@ void XmlReader::skipDocumentTypeDeclaration() { if (i < 0) { throw css::uno::RuntimeException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( - "premature end (within DTD) of ")) + + "premature end (within DTD) of ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -318,8 +314,7 @@ void XmlReader::skipDocumentTypeDeclaration() { case '\0': // i.e., EOF throw css::uno::RuntimeException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( - "premature end (within DTD) of ")) + + "premature end (within DTD) of ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); case '"': @@ -330,8 +325,7 @@ void XmlReader::skipDocumentTypeDeclaration() { if (i < 0) { throw css::uno::RuntimeException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( - "premature end (within DTD) of ")) + + "premature end (within DTD) of ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -343,8 +337,7 @@ void XmlReader::skipDocumentTypeDeclaration() { case '\0': // i.e., EOF throw css::uno::RuntimeException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( - "premature end (within DTD) of ")) + + "premature end (within DTD) of ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); case '!': @@ -362,8 +355,7 @@ void XmlReader::skipDocumentTypeDeclaration() { if (read() != '>') { throw css::uno::RuntimeException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( - "missing \">\" of DTD in ")) + + "missing \">\" of DTD in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -393,8 +385,7 @@ Span XmlReader::scanCdataSection() { if (i < 0) { throw css::uno::RuntimeException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( - "premature end (within CDATA section) of ")) + + "premature end (within CDATA section) of ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 1d43341e2025..e272072eddbd 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -99,8 +99,8 @@ void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) { m_nODF = nTmp; else throw uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "[xmlsecurity]SaveODFItem::SaveODFItem(): Wrong Type!")), 0 ); + OUString( + "[xmlsecurity]SaveODFItem::SaveODFItem(): Wrong Type!"), 0 ); } else diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx index eabf2a684aa1..bfdedf1b2ffe 100644 --- a/xmlsecurity/source/framework/buffernode.cxx +++ b/xmlsecurity/source/framework/buffernode.cxx @@ -277,7 +277,7 @@ OUString BufferNode::printChildren() const rc += OUString( "(" ); rc += OUString( "SecID=" ); rc += OUString::valueOf(((ElementCollector*)(*ii))->getSecurityId()); - rc += OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )); + rc += OUString( ")" ); rc += OUString( " " ); } diff --git a/xmlsecurity/source/framework/decryptorimpl.cxx b/xmlsecurity/source/framework/decryptorimpl.cxx index 512c9c79bffa..ec35abeec0a2 100644 --- a/xmlsecurity/source/framework/decryptorimpl.cxx +++ b/xmlsecurity/source/framework/decryptorimpl.cxx @@ -179,7 +179,7 @@ void SAL_CALL DecryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArg OUString DecryptorImpl_getImplementationName () throw (cssu::RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL DecryptorImpl_supportsService( const OUString& ServiceName ) @@ -193,7 +193,7 @@ cssu::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( ) { cssu::Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + pArray[0] = OUString ( SERVICE_NAME ); return aRet; } #undef SERVICE_NAME diff --git a/xmlsecurity/source/framework/encryptionengine.cxx b/xmlsecurity/source/framework/encryptionengine.cxx index 00d10dedc901..281f746bbfbe 100644 --- a/xmlsecurity/source/framework/encryptionengine.cxx +++ b/xmlsecurity/source/framework/encryptionengine.cxx @@ -113,7 +113,7 @@ void EncryptionEngine::tryToPerform( ) if (checkReady()) { const OUString sEncryptionTemplate ( - RTL_CONSTASCII_USTRINGPARAM( ENCRYPTION_TEMPLATE ) ); + ENCRYPTION_TEMPLATE ); cssu::Reference < cssxc::XXMLEncryptionTemplate > xEncryptionTemplate( mxMSF->createInstance( sEncryptionTemplate ), cssu::UNO_QUERY ); diff --git a/xmlsecurity/source/framework/encryptorimpl.cxx b/xmlsecurity/source/framework/encryptorimpl.cxx index a83281fa3da2..39f73c614b43 100644 --- a/xmlsecurity/source/framework/encryptorimpl.cxx +++ b/xmlsecurity/source/framework/encryptorimpl.cxx @@ -214,7 +214,7 @@ void SAL_CALL EncryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArg OUString EncryptorImpl_getImplementationName () throw (cssu::RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL EncryptorImpl_supportsService( const OUString& ServiceName ) @@ -228,7 +228,7 @@ cssu::Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( ) { cssu::Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + pArray[0] = OUString ( SERVICE_NAME ); return aRet; } #undef SERVICE_NAME diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index e5da48beafba..4ff3b0f9dc53 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -382,7 +382,7 @@ OUString SAXEventKeeperImpl::printBufferNode( rc += OUString::valueOf( pBlocker->getBufferId() ); rc += OUString( "(SecId=" ); rc += OUString::valueOf( pBlocker->getSecurityId() ); - rc += OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )); + rc += OUString( ")" ); rc += OUString( " " ); } rc += OUString( "\n" ); @@ -1368,7 +1368,7 @@ void SAL_CALL SAXEventKeeperImpl::initialize( const cssu::Sequence< cssu::Any >& OUString SAXEventKeeperImpl_getImplementationName () throw (cssu::RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL SAXEventKeeperImpl_supportsService( const OUString& ServiceName ) @@ -1382,7 +1382,7 @@ cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( { cssu::Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + pArray[0] = OUString ( SERVICE_NAME ); return aRet; } #undef SERVICE_NAME diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx index 294ad99787c1..c2a3e25520d7 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx @@ -227,7 +227,7 @@ void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any OUString SignatureCreatorImpl_getImplementationName () throw (cssu::RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL SignatureCreatorImpl_supportsService( const OUString& ServiceName ) @@ -241,7 +241,7 @@ cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceName { cssu::Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + pArray[0] = OUString ( SERVICE_NAME ); return aRet; } #undef SERVICE_NAME diff --git a/xmlsecurity/source/framework/signatureengine.cxx b/xmlsecurity/source/framework/signatureengine.cxx index 1269f4680b01..dace95e340d9 100644 --- a/xmlsecurity/source/framework/signatureengine.cxx +++ b/xmlsecurity/source/framework/signatureengine.cxx @@ -114,7 +114,7 @@ void SignatureEngine::tryToPerform( ) if (checkReady()) { const OUString ouSignatureTemplate ( - RTL_CONSTASCII_USTRINGPARAM( SIGNATURE_TEMPLATE ) ); + SIGNATURE_TEMPLATE ); cssu::Reference < cssxc::XXMLSignatureTemplate > xSignatureTemplate( mxMSF->createInstance( ouSignatureTemplate ), cssu::UNO_QUERY ); diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx index f24d8bc35e4b..0d42b6d083be 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.cxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx @@ -174,7 +174,7 @@ OUString SignatureVerifierImpl_getImplementationName () throw (cssu::RuntimeException) { return OUString( - RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const OUString& ServiceName ) @@ -188,7 +188,7 @@ cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNam { cssu::Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + pArray[0] = OUString ( SERVICE_NAME ); return aRet; } #undef SERVICE_NAME diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index b91e1db8569d..123978769d3a 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -303,7 +303,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex deleteRootsModule(); #if defined SYSTEM_NSS - OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi" SAL_DLLEXTENSION)); + OUString rootModule("libnssckbi" SAL_DLLEXTENSION); #else OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${LO_LIB_DIR}/libnssckbi" SAL_DLLEXTENSION)); #endif @@ -479,7 +479,7 @@ OUString ONSSInitializer_getImplementationName () throw (cssu::RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL ONSSInitializer_supportsService( const OUString& ServiceName ) @@ -493,7 +493,7 @@ cssu::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames( ) { cssu::Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( NSS_SERVICE_NAME ) ); + pArray[0] = OUString ( NSS_SERVICE_NAME ); return aRet; } diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx index aaa21295a663..015f6560ecfb 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx @@ -79,12 +79,12 @@ uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL try { /* Build XML Security Context */ - const OUString sSecyrutyContext ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_CONTEXT ) ); + const OUString sSecyrutyContext ( SECURITY_CONTEXT ); uno::Reference< cssxc::XXMLSecurityContext > xSecCtx( m_xContext->getServiceManager()->createInstanceWithContext(sSecyrutyContext, m_xContext), uno::UNO_QUERY ); if( !xSecCtx.is() ) return NULL; - const OUString sSecyrutyEnvironment ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_ENVIRONMENT ) ); + const OUString sSecyrutyEnvironment ( SECURITY_ENVIRONMENT ); uno::Reference< cssxc::XSecurityEnvironment > xSecEnv( m_xContext->getServiceManager()->createInstanceWithContext(sSecyrutyEnvironment, m_xContext), uno::UNO_QUERY ); uno::Reference< cssl::XUnoTunnel > xEnvTunnel( xSecEnv , uno::UNO_QUERY ) ; if( !xEnvTunnel.is() ) @@ -123,7 +123,7 @@ OUString SEInitializer_NssImpl_getImplementationName () throw (uno::RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const OUString& ServiceName ) @@ -137,8 +137,8 @@ uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceName { uno::Sequence < OUString > aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SE_SERVICE_NAME ) ); - pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( NSS_SERVICE_NAME ) ); + pArray[0] = OUString ( SE_SERVICE_NAME ); + pArray[1] = OUString ( NSS_SERVICE_NAME ); return aRet; } diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx index de4570134736..6dd1853486f8 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx @@ -73,7 +73,7 @@ sal_Int64 SAL_CALL XMLElementWrapper_XmlSecImpl::getSomething( const cssu::Seque OUString XMLElementWrapper_XmlSecImpl_getImplementationName () throw (cssu::RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl_supportsService( const OUString& ServiceName ) @@ -87,7 +87,7 @@ cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedSer { cssu::Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + pArray[0] = OUString ( SERVICE_NAME ); return aRet; } #undef SERVICE_NAME |