mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove usage of RTL_CONSTASCII_USTRINGPARAM

Browse Source 
Mechanical removal of usage together with OUString ctor, done
by compiler plugin.

Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5
This commit is contained in:
Luboš Luňák 2013-05-06 16:32:22 +02:00
parent d01768c31a
commit e2e2cc6114
218 changed files with 954 additions and 1061 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
connectivity/source/commontools/dbtools.cxx
View File

@ -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
}

6
connectivity/source/commontools/dbtools2.cxx
View File

@ -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;
}

2
connectivity/source/drivers/jdbc/InputStream.cxx
View File

@ -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!");

2
connectivity/source/drivers/mork/MDatabaseMetaData.cxx
View File

@ -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)

2
connectivity/source/drivers/mork/MStatement.cxx
View File

@ -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 );

3
cppu/source/threadpool/thread.cxx
View File

@ -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 );

2
cppu/source/uno/cascade_mapping.cxx
View File

@ -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);

2
cppu/source/uno/lbenv.cxx
View File

@ -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 );

4
cppu/source/uno/lbmap.cxx
View File

@ -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;

2
cppuhelper/source/component_context.cxx
View File

@ -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);

2
cppuhelper/source/macro_expander.cxx
View File

@ -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);

51
cppuhelper/source/propertysetmixin.cxx
View File

@ -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);
}

2
cppuhelper/source/tdmgr.cxx
View File

@ -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);

4
cppuhelper/source/unourl.cxx
View File

@ -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)

8
cpputools/source/unoexe/unoexe.cxx
View File

@ -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 >() );
}
}
}

4
cui/source/dialogs/colorpicker.cxx
View File

@ -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 )
{

4
cui/source/dialogs/cuigaldlg.cxx
View File

@ -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 )

2
cui/source/options/optgdlg.cxx
View File

@ -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 );
}

4
dbaccess/source/ui/misc/DExport.cxx
View File

@ -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

2
dbaccess/source/ui/querydesign/QueryDesignView.cxx
View File

@ -2932,7 +2932,7 @@ OUString OQueryDesignView::getStatement()
{
OUString aTmp("( ");
aTmp += aJoinCrit;
aTmp += OUString(RTL_CONSTASCII_USTRINGPARAM(" )"));
aTmp += OUString(" )");
if(aCriteriaListStr.getLength())
{
aTmp += C_AND;

2
dtrans/source/cnttype/mctfentry.cxx
View File

@ -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 ),

22
editeng/source/uno/unonrule.cxx
View File

@ -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);

18
embeddedobj/source/commonembedding/persistence.cxx
View File

@ -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 );

2
embeddedobj/source/commonembedding/visobj.cxx
View File

@ -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 ) );

16
embeddedobj/source/general/dummyobject.cxx
View File

@ -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

6
embeddedobj/source/general/intercept.cxx
View File

@ -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);
{

18
embeddedobj/source/msole/olepersist.cxx
View File

@ -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 )

4
embeddedobj/source/msole/olevisual.cxx
View File

@ -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 ) );
}

2
extensions/source/bibliography/datman.cxx
View File

@ -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 ) );
}

4
extensions/source/logging/csvformatter.cxx
View File

@ -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)

2
filter/source/msfilter/svdfppt.cxx
View File

@ -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);

2
filter/source/placeware/filter.cxx
View File

@ -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

12
filter/source/svg/impsvgdialog.cxx
View File

@ -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() );
}

4
filter/source/svg/svgdialog.cxx
View File

@ -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;
}

6
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
View File

@ -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

26
filter/source/xsltdialog/typedetectionimport.cxx
View File

@ -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( " " )
{
}

12
filter/source/xsltdialog/xmlfilterjar.cxx
View File

@ -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
{

2
formula/source/ui/dlg/formula.cxx
View File

@ -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);

2
fpicker/source/office/iodlg.cxx
View File

@ -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 );
}

2
framework/source/layoutmanager/toolbarlayoutmanager.cxx
View File

@ -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 );

2
framework/source/services/autorecovery.cxx
View File

@ -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();

2
i18npool/qa/cppunit/test_breakiterator.cxx
View File

@ -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");

2
include/test/util/xsearchable.hxx
View File

@ -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();

6
include/uno/current_context.hxx
View File

@ -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 );

2
include/uno/environment.hxx
View File

@ -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.

8
include/uno/mapping.hxx
View File

@ -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 ) );

4
io/source/stm/opipe.cxx
View File

@ -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;
}
}

10
javaunohelper/source/javaunohelper.cxx
View File

@ -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)
{

3
javaunohelper/source/vm.cxx
View File

@ -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 >() );
}
}

24
jvmfwk/source/fwkbase.cxx
View File

@ -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)
{

2
registry/source/regimpl.cxx
View File

@ -427,7 +427,7 @@ ORegistry::ORegistry()
: m_refCount(1)
, m_readOnly(sal_False)
, m_isOpen(sal_False)
, ROOT( RTL_CONSTASCII_USTRINGPARAM("/") )
, ROOT( "/" )
{
}

4
remotebridges/source/unourl_resolver/unourl_resolver.cxx
View File

@ -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);
}
//==================================================================================================

4
reportdesign/source/core/api/ReportDefinition.cxx
View File

@ -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);

6
reportdesign/source/filter/xml/xmlCell.cxx
View File

@ -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(" & ");

36
reportdesign/source/filter/xml/xmlExport.cxx
View File

@ -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);

6
reportdesign/source/filter/xml/xmlFixedContent.cxx
View File

@ -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(" & ");

4
reportdesign/source/filter/xml/xmlFormattedField.cxx
View File

@ -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);
}
}

6
reportdesign/source/filter/xml/xmlGroup.cxx
View File

@ -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 )
{

8
reportdesign/source/filter/xml/xmlStyleImport.cxx
View File

@ -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)

14
reportdesign/source/ui/inspection/GeometryHandler.cxx
View File

@ -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);

8
reportdesign/source/ui/report/ReportController.cxx
View File

@ -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);
}

2
sal/osl/all/debugbase.cxx
View File

@ -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);

6
sal/qa/osl/file/osl_old_test_file.cxx
View File

@ -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 )
{

4
sal/qa/rtl/doublelock/rtl_doublelocking.cxx
View File

@ -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; }

6
sal/qa/rtl/uri/rtl_testuri.cxx
View File

@ -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));

8
sal/rtl/bootstrap.cxx
View File

@ -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;
}

2
sc/source/filter/excel/excimp8.cxx
View File

@ -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)

2
sc/source/filter/excel/expop2.cxx
View File

@ -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

2
sc/source/filter/excel/xestream.cxx
View File

@ -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

16
sc/source/filter/excel/xltools.cxx
View File

@ -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 )
{

2
sc/source/filter/oox/workbookhelper.cxx
View File

@ -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;
}

18
sc/source/filter/xml/XMLCalculationSettingsContext.cxx
View File

@ -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());

2
sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
View File

@ -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();

2
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
View File

@ -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)

4
sc/source/filter/xml/XMLCodeNameProvider.cxx
View File

@ -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" )
{
}

2
sc/source/filter/xml/XMLExportDDELinks.cxx
View File

@ -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();

4
sc/source/filter/xml/XMLExportDatabaseRanges.cxx
View File

@ -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();

48
sc/source/filter/xml/XMLStylesExportHelper.cxx
View File

@ -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

16
sc/source/filter/xml/XMLTableMasterPageExport.cxx
View File

@ -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 );
}

2
sc/source/filter/xml/XMLTableShapeImportHelper.cxx
View File

@ -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) );
}
}

2
sc/source/filter/xml/xmlcoli.cxx
View File

@ -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;

8
sc/source/filter/xml/xmldrani.cxx
View File

@ -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

82
sc/source/filter/xml/xmlexprt.cxx
View File

@ -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();

20
sc/source/filter/xml/xmlimprt.cxx
View File

@ -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;

4
sc/source/filter/xml/xmlrowi.cxx
View File

@ -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));
}
}
}

18
sc/source/filter/xml/xmlsorti.cxx
View File

@ -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);

6
sc/source/filter/xml/xmlstyle.cxx
View File

@ -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:

10
sc/source/filter/xml/xmlstyli.cxx
View File

@ -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));
}
// ---------------------------------------------------------------------------

2
sc/source/filter/xml/xmlwrap.cxx
View File

@ -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));
}

4
sc/source/ui/Accessibility/AccessibleCellBase.cxx
View File

@ -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;
}
}

4
sc/source/ui/Accessibility/AccessibleDocument.cxx
View File

@ -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

4
sc/source/ui/app/inputhdl.cxx
View File

@ -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())

2
sc/source/ui/app/inputwin.cxx
View File

@ -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();
}

2
sc/source/ui/app/scmod2.cxx
View File

@ -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 );
}

2
sc/source/ui/cctrl/checklistmenu.cxx
View File

@ -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),

8
sc/source/ui/dbgui/csvruler.cxx
View File

@ -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;

2
sc/source/ui/dbgui/foptmgr.cxx
View File

@ -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 );

2
sc/source/ui/dbgui/pfiltdlg.cxx
View File

@ -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

36
sc/source/ui/dbgui/scuiasciiopt.cxx
View File

@ -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();

2
sc/source/ui/dbgui/tpsort.cxx
View File

@ -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();

Some files were not shown because too many files have changed in this diff Show More