summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@alta.org.br>2012-04-15 23:14:28 -0300
committerOlivier Hallot <olivier.hallot@alta.org.br>2012-04-15 23:14:28 -0300
commitff3fd9331dfdbe848c8be2e32cb2e173b96902a4 (patch)
treeccf3e38c80db1a85d4ca17156e2d85b6f39dd514
parent7715779e4b0f9fce364a3429b8775abffa3cd176 (diff)
More RTL_CONSTASCII_USTRINGPARAM removals
/sd/../core
-rw-r--r--sd/source/core/CustomAnimationEffect.cxx44
-rw-r--r--sd/source/core/CustomAnimationPreset.cxx57
-rw-r--r--sd/source/core/EffectMigration.cxx2
-rw-r--r--sd/source/core/TransitionPreset.cxx25
-rw-r--r--sd/source/core/annotations/Annotation.cxx18
-rw-r--r--sd/source/core/drawdoc4.cxx106
-rw-r--r--sd/source/core/sdpage.cxx6
-rw-r--r--sd/source/core/sdpage_animations.cxx4
-rw-r--r--sd/source/core/stlfamily.cxx6
-rw-r--r--sd/source/core/stlpool.cxx2
-rw-r--r--sd/source/core/stlsheet.cxx37
11 files changed, 139 insertions, 168 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index d87ab92e9b05..fe4ebdf77d28 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -314,7 +314,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In
{
// TODO/LATER: Optimize this, don't create a break iterator each time
Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() );
- Reference < i18n::XBreakIterator > xBI( xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.BreakIterator" )) ), UNO_QUERY );
+ Reference < i18n::XBreakIterator > xBI( xMSF->createInstance( "com.sun.star.i18n.BreakIterator" ), UNO_QUERY );
DBG_ASSERT( xBI.is(), "sd::CustomAnimationEffect::getNumberOfSubitems(), could not create a 'com.sun.star.i18n.BreakIterator'!" );
if( xBI.is() )
@@ -322,7 +322,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In
Reference< XEnumerationAccess > xEA( xShape, UNO_QUERY_THROW );
Reference< XEnumeration > xEnumeration( xEA->createEnumeration(), UNO_QUERY_THROW );
Locale aLocale;
- const OUString aStrLocaleName( RTL_CONSTASCII_USTRINGPARAM("CharLocale") );
+ const OUString aStrLocaleName( "CharLocale" );
Reference< XTextRange > xParagraph;
sal_Int32 nPara = 0;
@@ -463,7 +463,7 @@ void CustomAnimationEffect::setPresetClass( sal_Int16 nPresetClass )
{
nLength = aUserData.getLength();
aUserData.realloc( nLength + 1);
- aUserData[nLength].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "preset-class" ) );
+ aUserData[nLength].Name = "preset-class";
aUserData[nLength].Value <<= mnPresetClass;
}
@@ -504,7 +504,7 @@ void CustomAnimationEffect::setNodeType( sal_Int16 nNodeType )
{
nLength = aUserData.getLength();
aUserData.realloc( nLength + 1);
- aUserData[nLength].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "node-type" ) );
+ aUserData[nLength].Name = "node-type";
aUserData[nLength].Value <<= mnNodeType;
}
@@ -545,7 +545,7 @@ void CustomAnimationEffect::setGroupId( sal_Int32 nGroupId )
{
nLength = aUserData.getLength();
aUserData.realloc( nLength + 1);
- aUserData[nLength].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "group-id" ) );
+ aUserData[nLength].Name = "group-id";
aUserData[nLength].Value <<= mnGroupId;
}
@@ -597,7 +597,7 @@ bool CustomAnimationEffect::checkForText()
if( xParaSet.is() )
{
sal_Int32 nParaDepth = 0;
- const OUString strNumberingLevel( RTL_CONSTASCII_USTRINGPARAM("NumberingLevel") );
+ const OUString strNumberingLevel( "NumberingLevel" );
xParaSet->getPropertyValue( strNumberingLevel ) >>= nParaDepth;
bChange |= nParaDepth != mnParaDepth;
mnParaDepth = nParaDepth;
@@ -992,12 +992,12 @@ Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const
if( maDimColor.hasValue() )
{
aTo = maDimColor;
- aAttributeName = OUString( RTL_CONSTASCII_USTRINGPARAM( "DimColor" ) );
+ aAttributeName = "DimColor";
}
else
{
aTo = makeAny( (sal_Bool)sal_False );
- aAttributeName = OUString( RTL_CONSTASCII_USTRINGPARAM( "Visibility" ) );
+ aAttributeName = "Visibility";
}
Any aBegin;
@@ -1557,7 +1557,7 @@ void CustomAnimationEffect::createAudio( const ::com::sun::star::uno::Any& rSour
if( !mxAudio.is() ) try
{
Reference< XMultiServiceFactory > xMsf( ::comphelper::getProcessServiceFactory() );
- Reference< XAudio > xAudio( xMsf->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.animations.Audio") ) ), UNO_QUERY_THROW );
+ Reference< XAudio > xAudio( xMsf->createInstance( "com.sun.star.animations.Audio" ), UNO_QUERY_THROW );
xAudio->setSource( rSource );
xAudio->setVolume( fVolume );
setAudio( xAudio );
@@ -1653,7 +1653,7 @@ void CustomAnimationEffect::setStopAudio()
removeAudio();
Reference< XMultiServiceFactory > xMsf( ::comphelper::getProcessServiceFactory() );
- Reference< XCommand > xCommand( xMsf->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.animations.Command") ) ), UNO_QUERY_THROW );
+ Reference< XCommand > xCommand( xMsf->createInstance( "com.sun.star.animations.Command" ), UNO_QUERY_THROW );
xCommand->setCommand( EffectCommands::STOPAUDIO );
@@ -1886,7 +1886,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb
try
{
Reference< XTimeContainer > xEffectContainer( createParallelTimeContainer() );
- const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.animations.AnimateMotion" ) );
+ const OUString aServiceName( "com.sun.star.animations.AnimateMotion" );
Reference< XAnimationNode > xAnimateMotion( ::comphelper::getProcessServiceFactory()->createInstance(aServiceName), UNO_QUERY_THROW );
xAnimateMotion->setDuration( Any( fDuration ) );
@@ -2107,7 +2107,7 @@ void EffectSequenceHelper::implRebuild()
Reference< XTimeContainer > EffectSequenceHelper::createParallelTimeContainer() const
{
- const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.animations.ParallelTimeContainer" ) );
+ const OUString aServiceName( "com.sun.star.animations.ParallelTimeContainer" );
return Reference< XTimeContainer >( ::comphelper::getProcessServiceFactory()->createInstance(aServiceName), UNO_QUERY );
}
@@ -2160,7 +2160,7 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
Sequence< NamedValue > aUserData( rNode.mxNode->getUserData() );
sal_Int32 nSize = aUserData.getLength();
aUserData.realloc(nSize+1);
- aUserData[nSize].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "master-element" ) );
+ aUserData[nSize].Name = "master-element";
aUserData[nSize].Value <<= xMasterNode;
rNode.mxNode->setUserData( aUserData );
@@ -2199,7 +2199,7 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
else
{
// this does not yet have a child container, create one
- const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.animations.ParallelTimeContainer") );
+ const OUString aServiceName( "com.sun.star.animations.ParallelTimeContainer" );
xNextContainer = Reference< XTimeContainer >::query( xMsf->createInstance(aServiceName) );
if( xNextContainer.is() )
@@ -2216,7 +2216,7 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
// if we don't have a next container, we add one to the sequence container
if( !xNextContainer.is() )
{
- const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.animations.ParallelTimeContainer") );
+ const OUString aServiceName( "com.sun.star.animations.ParallelTimeContainer" );
Reference< XTimeContainer > xNewClickContainer( xMsf->createInstance(aServiceName), UNO_QUERY_THROW );
Reference< XAnimationNode > xNewClickNode( xNewClickContainer, UNO_QUERY_THROW );
@@ -2640,7 +2640,7 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( CustomAnimationTextG
{
EffectSequence::iterator aInsertIter( find( pEffect ) );
- const OUString strNumberingLevel( RTL_CONSTASCII_USTRINGPARAM("NumberingLevel") );
+ const OUString strNumberingLevel( "NumberingLevel" );
Reference< XEnumerationAccess > xText( xTarget, UNO_QUERY_THROW );
Reference< XEnumeration > xEnumeration( xText->createEnumeration(), UNO_QUERY_THROW );
@@ -3202,7 +3202,7 @@ void SAL_CALL AnimationChangeListener::disposing( const ::com::sun::star::lang::
// ====================================================================
MainSequence::MainSequence()
-: mxTimingRootNode( ::comphelper::getProcessServiceFactory()->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.animations.SequenceTimeContainer"))), UNO_QUERY )
+: mxTimingRootNode( ::comphelper::getProcessServiceFactory()->createInstance("com.sun.star.animations.SequenceTimeContainer"), UNO_QUERY )
, mbRebuilding( false )
, mnRebuildLockGuard( 0 )
, mbPendingRebuildRequest( false )
@@ -3210,7 +3210,7 @@ MainSequence::MainSequence()
if( mxTimingRootNode.is() )
{
Sequence< ::com::sun::star::beans::NamedValue > aUserData( 1 );
- aUserData[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "node-type" ) );
+ aUserData[0].Name = "node-type";
aUserData[0].Value <<= ::com::sun::star::presentation::EffectNodeType::MAIN_SEQUENCE;
mxTimingRootNode->setUserData( aUserData );
}
@@ -3306,11 +3306,11 @@ void MainSequence::createMainSequence()
// see if we have a mainsequence at all. if not, create one...
if( !mxSequenceRoot.is() )
{
- mxSequenceRoot = Reference< XTimeContainer >::query(::comphelper::getProcessServiceFactory()->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.animations.SequenceTimeContainer"))));
+ mxSequenceRoot = Reference< XTimeContainer >::query(::comphelper::getProcessServiceFactory()->createInstance("com.sun.star.animations.SequenceTimeContainer"));
if( mxSequenceRoot.is() )
{
uno::Sequence< ::com::sun::star::beans::NamedValue > aUserData( 1 );
- aUserData[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "node-type" ) );
+ aUserData[0].Name = "node-type";
aUserData[0].Value <<= ::com::sun::star::presentation::EffectNodeType::MAIN_SEQUENCE;
mxSequenceRoot->setUserData( aUserData );
@@ -3371,12 +3371,12 @@ InteractiveSequencePtr MainSequence::createInteractiveSequence( const ::com::sun
InteractiveSequencePtr pIS;
// create a new interactive sequence container
- Reference< XTimeContainer > xISRoot( ::comphelper::getProcessServiceFactory()->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.animations.SequenceTimeContainer"))), UNO_QUERY );
+ Reference< XTimeContainer > xISRoot( ::comphelper::getProcessServiceFactory()->createInstance("com.sun.star.animations.SequenceTimeContainer"), UNO_QUERY );
DBG_ASSERT( xISRoot.is(), "sd::MainSequence::createInteractiveSequence(), could not create \"com.sun.star.animations.SequenceTimeContainer\"!");
if( xISRoot.is() )
{
uno::Sequence< ::com::sun::star::beans::NamedValue > aUserData( 1 );
- aUserData[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "node-type" ) );
+ aUserData[0].Name = "node-type";
aUserData[0].Value <<= ::com::sun::star::presentation::EffectNodeType::INTERACTIVE_SEQUENCE ;
xISRoot->setUserData( aUserData );
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index 122405890799..50343d23ef13 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -81,13 +81,12 @@ static Reference< XNameAccess > getNodeAccess( const Reference< XMultiServiceFac
{
Sequence< Any > aArgs( 1 );
PropertyValue aPropValue;
- aPropValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
+ aPropValue.Name = "nodepath";
aPropValue.Value <<= rNodePath;
aArgs[0] <<= aPropValue;
xConfigAccess = Reference< XNameAccess >::query(
- xConfigProvider->createInstanceWithArguments(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" )),
+ xConfigProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess" ,
aArgs ));
}
catch (const Exception&)
@@ -105,7 +104,7 @@ void implImportLabels( const Reference< XMultiServiceFactory >& xConfigProvider,
Reference< XNameAccess > xConfigAccess( getNodeAccess( xConfigProvider, rNodePath ) );
if( xConfigAccess.is() )
{
- OUString aLabel( RTL_CONSTASCII_USTRINGPARAM( "Label" ) );
+ OUString aLabel( "Label" );
Reference< XNameAccess > xNameAccess;
Sequence< OUString > aNames( xConfigAccess->getElementNames() );
const OUString* p = aNames.getConstArray();
@@ -268,19 +267,14 @@ Reference< XAnimationNode > implImportEffects( const Reference< XMultiServiceFac
aParserInput.aInputStream = xInputStream;
// get parser
- Reference< xml::sax::XParser > xParser(
- xServiceFactory->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ),
- UNO_QUERY );
+ Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance("com.sun.star.xml.sax.Parser" ), UNO_QUERY );
DBG_ASSERT( xParser.is(), "Can't create parser" );
if( !xParser.is() )
return xRootNode;
// get filter
- Reference< xml::sax::XDocumentHandler > xFilter(
- xServiceFactory->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Xmloff.AnimationsImport" ) ) ), UNO_QUERY );
+ Reference< xml::sax::XDocumentHandler > xFilter( xServiceFactory->createInstance("com.sun.star.comp.Xmloff.AnimationsImport" ), UNO_QUERY );
DBG_ASSERT( xFilter.is(), "Can't instantiate filter component." );
if( !xFilter.is() )
@@ -330,33 +324,29 @@ void CustomAnimationPresets::importEffects()
uno::Reference< beans::XPropertySet > xProps( xServiceFactory, UNO_QUERY );
uno::Reference< uno::XComponentContext > xContext;
- xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
+ xProps->getPropertyValue( "DefaultContext" ) >>= xContext;
uno::Reference< util::XMacroExpander > xMacroExpander;
if( xContext.is() )
- xMacroExpander.set( xContext->getValueByName(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander"))),
- UNO_QUERY );
+ xMacroExpander.set( xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), UNO_QUERY );
Reference< XMultiServiceFactory > xConfigProvider(
- xServiceFactory->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ))),
+ xServiceFactory->createInstance("com.sun.star.configuration.ConfigurationProvider" ),
UNO_QUERY_THROW );
// read path to transition effects files from config
Any propValue = uno::makeAny(
beans::PropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" )), -1,
- uno::makeAny( OUString( RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Impress/Misc") )),
+ "nodepath", -1,
+ uno::makeAny( OUString( "/org.openoffice.Office.Impress/Misc" )),
beans::PropertyState_DIRECT_VALUE ) );
Reference<container::XNameAccess> xNameAccess(
xConfigProvider->createInstanceWithArguments(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
+ "com.sun.star.configuration.ConfigurationAccess",
Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW );
uno::Sequence< rtl::OUString > aFiles;
- xNameAccess->getByName(
- OUString( RTL_CONSTASCII_USTRINGPARAM("EffectFiles"))) >>= aFiles;
+ xNameAccess->getByName( "EffectFiles" ) >>= aFiles;
for( sal_Int32 i=0; i<aFiles.getLength(); ++i )
{
@@ -429,32 +419,29 @@ void CustomAnimationPresets::importResources()
if( !xServiceFactory.is() )
return;
- Reference< XMultiServiceFactory > xConfigProvider(
- xServiceFactory->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ))),
- UNO_QUERY );
+ Reference< XMultiServiceFactory > xConfigProvider( xServiceFactory->createInstance("com.sun.star.configuration.ConfigurationProvider" ), UNO_QUERY );
- const OUString aPropertyPath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/UserInterface/Properties" ) );
+ const OUString aPropertyPath("/org.openoffice.Office.UI.Effects/UserInterface/Properties" );
implImportLabels( xConfigProvider, aPropertyPath, maPropertyNameMap );
- const OUString aEffectsPath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/UserInterface/Effects" ) );
+ const OUString aEffectsPath( "/org.openoffice.Office.UI.Effects/UserInterface/Effects" );
implImportLabels( xConfigProvider, aEffectsPath, maEffectNameMap );
importEffects();
- const OUString aEntrancePath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/Presets/Entrance" ) );
+ const OUString aEntrancePath( "/org.openoffice.Office.UI.Effects/Presets/Entrance" );
importPresets( xConfigProvider, aEntrancePath, maEntrancePresets );
- const OUString aEmphasisPath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/Presets/Emphasis" ) );
+ const OUString aEmphasisPath( "/org.openoffice.Office.UI.Effects/Presets/Emphasis" );
importPresets( xConfigProvider, aEmphasisPath, maEmphasisPresets );
- const OUString aExitPath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/Presets/Exit" ) );
+ const OUString aExitPath( "/org.openoffice.Office.UI.Effects/Presets/Exit" );
importPresets( xConfigProvider, aExitPath, maExitPresets );
- const OUString aMotionPathsPath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/Presets/MotionPaths" ) );
+ const OUString aMotionPathsPath( "/org.openoffice.Office.UI.Effects/Presets/MotionPaths" );
importPresets( xConfigProvider, aMotionPathsPath, maMotionPathsPresets );
- const OUString aMiscPath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/Presets/Misc" ) );
+ const OUString aMiscPath( "/org.openoffice.Office.UI.Effects/Presets/Misc" );
importPresets( xConfigProvider, aMiscPath, maMiscPresets );
}
catch (const lang::WrappedTargetException&)
@@ -479,8 +466,8 @@ void CustomAnimationPresets::importPresets( const Reference< XMultiServiceFactor
if( xTypeAccess.is() )
{
Reference< XNameAccess > xCategoryAccess;
- const OUString aEffectsName( RTL_CONSTASCII_USTRINGPARAM( "Effects" ) );
- const OUString aLabelName( RTL_CONSTASCII_USTRINGPARAM( "Label" ) );
+ const OUString aEffectsName( "Effects" );
+ const OUString aLabelName( "Label" );
Sequence< OUString > aNames( xTypeAccess->getElementNames() );
const OUString* p = aNames.getConstArray();
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 0e8d83925f1a..fc618bb50c72 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -648,7 +648,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect
else
{
OUString aEmpty;
- CustomAnimationPresetPtr pShapePreset( rPresets.getEffectDescriptor( OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo-entrance-appear" ) ) ) );
+ CustomAnimationPresetPtr pShapePreset( rPresets.getEffectDescriptor( "ooo-entrance-appear" ) );
Reference< XAnimationNode > xNode( pPreset->create( aEmpty ) );
DBG_ASSERT( xNode.is(), "EffectMigration::SetTextAnimationEffect(), could not create preset!" );
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 5d4820070a24..dd03514cd5d4 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -160,38 +160,33 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList )
uno::Reference< beans::XPropertySet > xProps( xServiceFactory, UNO_QUERY );
uno::Reference< uno::XComponentContext > xContext;
- xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
+ xProps->getPropertyValue( "DefaultContext" ) >>= xContext;
uno::Reference< util::XMacroExpander > xMacroExpander;
if( xContext.is() )
- xMacroExpander.set( xContext->getValueByName(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander"))),
- UNO_QUERY );
+ xMacroExpander.set( xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), UNO_QUERY );
// import ui strings
Reference< XMultiServiceFactory > xConfigProvider(
- xServiceFactory->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ))),
- UNO_QUERY_THROW );
+ xServiceFactory->createInstance("com.sun.star.configuration.ConfigurationProvider" ), UNO_QUERY_THROW );
UStringMap aTransitionNameMape;
- const OUString aTransitionPath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/UserInterface/Transitions" ) );
+ const OUString aTransitionPath("/org.openoffice.Office.UI.Effects/UserInterface/Transitions" );
implImportLabels( xConfigProvider, aTransitionPath, aTransitionNameMape );
// read path to transition effects files from config
Any propValue = uno::makeAny(
- beans::PropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("nodepath")), -1,
- uno::makeAny( OUString( RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Impress/Misc"))),
+ beans::PropertyValue("nodepath", -1,
+ uno::makeAny( OUString("/org.openoffice.Office.Impress/Misc")),
beans::PropertyState_DIRECT_VALUE ) );
Reference<container::XNameAccess> xNameAccess(
xConfigProvider->createInstanceWithArguments(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
- Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW );
+ "com.sun.star.configuration.ConfigurationAccess",
+ Sequence<Any>( &propValue, 1 ) ),
+ UNO_QUERY_THROW );
uno::Sequence< rtl::OUString > aFiles;
- xNameAccess->getByName(
- OUString( RTL_CONSTASCII_USTRINGPARAM("TransitionFiles"))) >>= aFiles;
+ xNameAccess->getByName("TransitionFiles") >>= aFiles;
for( sal_Int32 i=0; i<aFiles.getLength(); ++i )
{
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx
index 3e1d0e1cea43..6696c494b713 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -260,9 +260,7 @@ RealPoint2D SAL_CALL Annotation::getPosition() throw (RuntimeException)
void SAL_CALL Annotation::setPosition(const RealPoint2D & the_value) throw (RuntimeException)
{
- prepareSet(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Position")),
- Any(), Any(), 0);
+ prepareSet("Position", Any(), Any(), 0);
{
osl::MutexGuard g(m_aMutex);
createChangeUndo();
@@ -279,9 +277,7 @@ RealSize2D SAL_CALL Annotation::getSize() throw (RuntimeException)
void SAL_CALL Annotation::setSize(const RealSize2D & the_value) throw (RuntimeException)
{
- prepareSet(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")),
- Any(), Any(), 0);
+ prepareSet("Size", Any(), Any(), 0);
{
osl::MutexGuard g(m_aMutex);
createChangeUndo();
@@ -297,9 +293,7 @@ OUString SAL_CALL Annotation::getAuthor() throw (RuntimeException)
void SAL_CALL Annotation::setAuthor(const OUString & the_value) throw (RuntimeException)
{
- prepareSet(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Author")),
- Any(), Any(), 0);
+ prepareSet("Author", Any(), Any(), 0);
{
osl::MutexGuard g(m_aMutex);
createChangeUndo();
@@ -315,9 +309,7 @@ util::DateTime SAL_CALL Annotation::getDateTime() throw (RuntimeException)
void SAL_CALL Annotation::setDateTime(const util::DateTime & the_value) throw (RuntimeException)
{
- prepareSet(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateTime")),
- Any(), Any(), 0);
+ prepareSet("DateTime", Any(), Any(), 0);
{
osl::MutexGuard g(m_aMutex);
createChangeUndo();
@@ -335,7 +327,7 @@ void Annotation::createChangeUndo()
{
pModel->SetChanged();
Reference< XInterface > xSource( static_cast<uno::XWeak*>( this ) );
- NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), OUString( RTL_CONSTASCII_USTRINGPARAM("OnAnnotationChanged") ), xSource );
+ NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), "OnAnnotationChanged" , xSource );
}
}
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 4fd109934688..4540d4971e4c 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -532,13 +532,13 @@ static void implCreateTableTemplate( const Reference< XNameContainer >& xTableFa
Reference< XNameReplace > xDefaultTableStyle( xFactory->createInstance(), UNO_QUERY_THROW );
xTableFamily->insertByName( OUString( rName ), Any( xDefaultTableStyle ) );
- xDefaultTableStyle->replaceByName( OUString( RTL_CONSTASCII_USTRINGPARAM("body") ), rBody );
- xDefaultTableStyle->replaceByName( OUString( RTL_CONSTASCII_USTRINGPARAM("odd-rows") ), rBanding );
- xDefaultTableStyle->replaceByName( OUString( RTL_CONSTASCII_USTRINGPARAM("odd-columns") ), rBanding );
- xDefaultTableStyle->replaceByName( OUString( RTL_CONSTASCII_USTRINGPARAM("first-row") ), rHeading );
- xDefaultTableStyle->replaceByName( OUString( RTL_CONSTASCII_USTRINGPARAM("first-column") ), rHeading );
- xDefaultTableStyle->replaceByName( OUString( RTL_CONSTASCII_USTRINGPARAM("last-row") ), rHeading );
- xDefaultTableStyle->replaceByName( OUString( RTL_CONSTASCII_USTRINGPARAM("last-column") ), rHeading );
+ xDefaultTableStyle->replaceByName( "body", rBody );
+ xDefaultTableStyle->replaceByName( "odd-rows" , rBanding );
+ xDefaultTableStyle->replaceByName( "odd-columns" , rBanding );
+ xDefaultTableStyle->replaceByName( "first-row" , rHeading );
+ xDefaultTableStyle->replaceByName( "first-column" , rHeading );
+ xDefaultTableStyle->replaceByName( "last-row" , rHeading );
+ xDefaultTableStyle->replaceByName( "last-column" , rHeading );
}
}
catch( Exception& )
@@ -553,14 +553,14 @@ void SdDrawDocument::CreateDefaultCellStyles()
SfxStyleSheetBase* pSheet = NULL;
String aHelpFile;
- const OUString sFamilyName( RTL_CONSTASCII_USTRINGPARAM( "table" ) );
- Reference< XNameContainer > xTableFamily( pSSPool->getByName( sFamilyName ), UNO_QUERY );
+ //const OUString sFamilyName( RTL_CONSTASCII_USTRINGPARAM( "table" ) );
+ Reference< XNameContainer > xTableFamily( pSSPool->getByName( "table" ), UNO_QUERY );
// ---- Default -----------------------------------------------
sal_uInt16 nMask = SFXSTYLEBIT_AUTO;
- OUString aDefaultCellStyleName( RTL_CONSTASCII_USTRINGPARAM("default") );
+ OUString aDefaultCellStyleName( "default" );
pSheet = &(pSSPool->Make(aDefaultCellStyleName, SD_STYLE_FAMILY_CELL, nMask));
pSheet->SetHelpId( aHelpFile, HID_SD_CELL_STYLE_DEFAULT );
@@ -631,91 +631,91 @@ void SdDrawDocument::CreateDefaultCellStyles()
// ---- default --------------------------------------------------
- Any aGray1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("gray1") ), aDefaultCellStyleName, RGB_COLORDATA(230,230,230)));
- Any aGray2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("gray2") ), aDefaultCellStyleName, RGB_COLORDATA(204,204,204)));
- Any aGray3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("gray3") ), aDefaultCellStyleName, RGB_COLORDATA(179,179,179)));
+ Any aGray1( implMakeSolidCellStyle( pSSPool, "gray1" , aDefaultCellStyleName, RGB_COLORDATA(230,230,230)));
+ Any aGray2( implMakeSolidCellStyle( pSSPool, "gray2" , aDefaultCellStyleName, RGB_COLORDATA(204,204,204)));
+ Any aGray3( implMakeSolidCellStyle( pSSPool, "gray3" , aDefaultCellStyleName, RGB_COLORDATA(179,179,179)));
implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("default") ), aGray1, aGray3, aGray2 );
// ---- BW ------------------------------------------------
- Any aBW1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("bw1") ), aDefaultCellStyleName, RGB_COLORDATA(255,255,255)));
- Any aBW2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("bw2") ), aDefaultCellStyleName, RGB_COLORDATA(230,230,230)));
- Any aBW3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("bw3") ), aDefaultCellStyleName, RGB_COLORDATA(0,0,0)));
+ Any aBW1( implMakeSolidCellStyle( pSSPool, "bw1" , aDefaultCellStyleName, RGB_COLORDATA(255,255,255)));
+ Any aBW2( implMakeSolidCellStyle( pSSPool, "bw2" , aDefaultCellStyleName, RGB_COLORDATA(230,230,230)));
+ Any aBW3( implMakeSolidCellStyle( pSSPool, "bw3" , aDefaultCellStyleName, RGB_COLORDATA(0,0,0)));
- implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("bw") ), aBW1, aBW3, aBW2 );
+ implCreateTableTemplate( xTableFamily, "bw" , aBW1, aBW3, aBW2 );
// ---- Orange --------------------------------------------------
- Any aOrange1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("orange1") ), aDefaultCellStyleName, RGB_COLORDATA(255,204,153)));
- Any aOrange2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("orange2") ), aDefaultCellStyleName, RGB_COLORDATA(255,153,102)));
- Any aOrange3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("orange3") ), aDefaultCellStyleName, RGB_COLORDATA(255,102,51)));
+ Any aOrange1( implMakeSolidCellStyle( pSSPool, "orange1" , aDefaultCellStyleName, RGB_COLORDATA(255,204,153)));
+ Any aOrange2( implMakeSolidCellStyle( pSSPool, "orange2" , aDefaultCellStyleName, RGB_COLORDATA(255,153,102)));
+ Any aOrange3( implMakeSolidCellStyle( pSSPool, "orange3" , aDefaultCellStyleName, RGB_COLORDATA(255,102,51)));
- implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("orange") ), aOrange1, aOrange3, aOrange2 );
+ implCreateTableTemplate( xTableFamily, "orange" , aOrange1, aOrange3, aOrange2 );
// ---- Turquise --------------------------------------------------
- Any aTurquise1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("turquise1") ), aDefaultCellStyleName, RGB_COLORDATA(71,184,184)));
- Any aTurquise2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("turquise2") ), aDefaultCellStyleName, RGB_COLORDATA(51,163,163)));
- Any aTurquise3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("turquise3") ), aDefaultCellStyleName, RGB_COLORDATA(25,138,138)));
+ Any aTurquise1( implMakeSolidCellStyle( pSSPool, "turquise1" , aDefaultCellStyleName, RGB_COLORDATA(71,184,184)));
+ Any aTurquise2( implMakeSolidCellStyle( pSSPool, "turquise2" , aDefaultCellStyleName, RGB_COLORDATA(51,163,163)));
+ Any aTurquise3( implMakeSolidCellStyle( pSSPool, "turquise3" , aDefaultCellStyleName, RGB_COLORDATA(25,138,138)));
- implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("turquise") ), aTurquise1, aTurquise3, aTurquise2 );
+ implCreateTableTemplate( xTableFamily, "turquise" , aTurquise1, aTurquise3, aTurquise2 );
// ---- Gray ------------------------------------------------
- Any aBlue1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("blue1") ), aDefaultCellStyleName, RGB_COLORDATA(153,204,255)));
- Any aBlue2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("blue2") ), aDefaultCellStyleName, RGB_COLORDATA(0,153,255)));
- Any aBlue3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("blue3") ), aDefaultCellStyleName, RGB_COLORDATA(0,102,204)));
+ Any aBlue1( implMakeSolidCellStyle( pSSPool, "blue1" , aDefaultCellStyleName, RGB_COLORDATA(153,204,255)));
+ Any aBlue2( implMakeSolidCellStyle( pSSPool, "blue2" , aDefaultCellStyleName, RGB_COLORDATA(0,153,255)));
+ Any aBlue3( implMakeSolidCellStyle( pSSPool, "blue3" , aDefaultCellStyleName, RGB_COLORDATA(0,102,204)));
- implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("blue")), aBlue1, aBlue3, aBlue2 );
+ implCreateTableTemplate( xTableFamily, "blue" , aBlue1, aBlue3, aBlue2 );
// ---- Sun ------------------------------------------------
- Any aSun1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("sun1") ), aDefaultCellStyleName, RGB_COLORDATA(230,230,255)));
- Any aSun2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("sun2") ), aDefaultCellStyleName, RGB_COLORDATA(204,204,255)));
- Any aSun3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("sun3") ), aDefaultCellStyleName, RGB_COLORDATA(153,153,255)));
+ Any aSun1( implMakeSolidCellStyle( pSSPool, "sun1" , aDefaultCellStyleName, RGB_COLORDATA(230,230,255)));
+ Any aSun2( implMakeSolidCellStyle( pSSPool, "sun2" , aDefaultCellStyleName, RGB_COLORDATA(204,204,255)));
+ Any aSun3( implMakeSolidCellStyle( pSSPool, "sun3" , aDefaultCellStyleName, RGB_COLORDATA(153,153,255)));
- implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("sun") ), aSun1, aSun3, aSun2 );
+ implCreateTableTemplate( xTableFamily, "sun" , aSun1, aSun3, aSun2 );
// ---- Earth ----------------------------------------------
- Any aEarth1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("earth1") ), aDefaultCellStyleName, RGB_COLORDATA(255,255,204)));
- Any aEarth2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("earth2") ), aDefaultCellStyleName, RGB_COLORDATA(255,204,153)));
- Any aEarth3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("earth3") ), aDefaultCellStyleName, RGB_COLORDATA(204,102,51)));
+ Any aEarth1( implMakeSolidCellStyle( pSSPool, "earth1" , aDefaultCellStyleName, RGB_COLORDATA(255,255,204)));
+ Any aEarth2( implMakeSolidCellStyle( pSSPool, "earth2" , aDefaultCellStyleName, RGB_COLORDATA(255,204,153)));
+ Any aEarth3( implMakeSolidCellStyle( pSSPool, "earth3" , aDefaultCellStyleName, RGB_COLORDATA(204,102,51)));
- implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("earth") ), aEarth1, aEarth3, aEarth2 );
+ implCreateTableTemplate( xTableFamily, "earth" , aEarth1, aEarth3, aEarth2 );
// ---- Green ----------------------------------------------
- Any aGreen1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("green1") ), aDefaultCellStyleName, RGB_COLORDATA(255,255,204)));
- Any aGreen2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("green2") ), aDefaultCellStyleName, RGB_COLORDATA(148,189,94)));
- Any aGreen3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("green3") ), aDefaultCellStyleName, RGB_COLORDATA(92,133,38)));
+ Any aGreen1( implMakeSolidCellStyle( pSSPool, "green1" , aDefaultCellStyleName, RGB_COLORDATA(255,255,204)));
+ Any aGreen2( implMakeSolidCellStyle( pSSPool, "green2" , aDefaultCellStyleName, RGB_COLORDATA(148,189,94)));
+ Any aGreen3( implMakeSolidCellStyle( pSSPool, "green3" , aDefaultCellStyleName, RGB_COLORDATA(92,133,38)));
- implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("green") ), aGreen1, aGreen3, aGreen2 );
+ implCreateTableTemplate( xTableFamily, "green" , aGreen1, aGreen3, aGreen2 );
// ---- Seetang ----------------------------------------------
- Any aSeetang1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("seetang1") ), aDefaultCellStyleName, RGB_COLORDATA(204,255,255)));
- Any aSeetang2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("seetang2") ), aDefaultCellStyleName, RGB_COLORDATA(71,184,184)));
- Any aSeetang3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("seetang3") ), aDefaultCellStyleName, RGB_COLORDATA(51,163,163)));
+ Any aSeetang1( implMakeSolidCellStyle( pSSPool, "seetang1" , aDefaultCellStyleName, RGB_COLORDATA(204,255,255)));
+ Any aSeetang2( implMakeSolidCellStyle( pSSPool, "seetang2" , aDefaultCellStyleName, RGB_COLORDATA(71,184,184)));
+ Any aSeetang3( implMakeSolidCellStyle( pSSPool, "seetang3" , aDefaultCellStyleName, RGB_COLORDATA(51,163,163)));
- implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("seetang") ), aSeetang1, aSeetang3, aSeetang2 );
+ implCreateTableTemplate( xTableFamily, "seetang" , aSeetang1, aSeetang3, aSeetang2 );
// ---- LightBlue ----------------------------------------------
- Any aLightBlue1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("lightblue1") ), aDefaultCellStyleName, RGB_COLORDATA(255,255,255)));
- Any aLightBlue2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("lightblue2") ), aDefaultCellStyleName, RGB_COLORDATA(230,230,255)));
- Any aLightBlue3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("lightblue3") ), aDefaultCellStyleName, RGB_COLORDATA(153,153,204)));
+ Any aLightBlue1( implMakeSolidCellStyle( pSSPool, "lightblue1" , aDefaultCellStyleName, RGB_COLORDATA(255,255,255)));
+ Any aLightBlue2( implMakeSolidCellStyle( pSSPool, "lightblue2" , aDefaultCellStyleName, RGB_COLORDATA(230,230,255)));
+ Any aLightBlue3( implMakeSolidCellStyle( pSSPool, "lightblue3" , aDefaultCellStyleName, RGB_COLORDATA(153,153,204)));
- implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("lightblue") ), aLightBlue1, aLightBlue3, aLightBlue2 );
+ implCreateTableTemplate( xTableFamily, "lightblue" , aLightBlue1, aLightBlue3, aLightBlue2 );
// ---- Yellow ----------------------------------------------
- Any aYellow1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("yellow1") ), aDefaultCellStyleName, RGB_COLORDATA(255,255,204)));
- Any aYellow2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("yellow2") ), aDefaultCellStyleName, RGB_COLORDATA(255,255,153)));
- Any aYellow3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("yellow3") ), aDefaultCellStyleName, RGB_COLORDATA(255,204,153)));
+ Any aYellow1( implMakeSolidCellStyle( pSSPool, "yellow1" , aDefaultCellStyleName, RGB_COLORDATA(255,255,204)));
+ Any aYellow2( implMakeSolidCellStyle( pSSPool, "yellow2" , aDefaultCellStyleName, RGB_COLORDATA(255,255,153)));
+ Any aYellow3( implMakeSolidCellStyle( pSSPool, "yellow3" , aDefaultCellStyleName, RGB_COLORDATA(255,204,153)));
- implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("yellow") ), aYellow1, aYellow3, aYellow2 );
+ implCreateTableTemplate( xTableFamily, "yellow" , aYellow1, aYellow3, aYellow2 );
}
/*************************************************************************
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 76e84f9d8536..e1aab55c5226 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -323,7 +323,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const
case PRESOBJ_CHART:
{
pSdrObj = new SdrOle2Obj();
- ( (SdrOle2Obj*) pSdrObj)->SetProgName( String( RTL_CONSTASCII_USTRINGPARAM( "StarChart" )));
+ ( (SdrOle2Obj*) pSdrObj)->SetProgName( rtl::OUString( "StarChart" ) );
BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_CHART ) );
Graphic aGraphic( aBmpEx );
( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic);
@@ -333,7 +333,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const
case PRESOBJ_ORGCHART:
{
pSdrObj = new SdrOle2Obj();
- ( (SdrOle2Obj*) pSdrObj)->SetProgName( String( RTL_CONSTASCII_USTRINGPARAM( "StarOrg" )));
+ ( (SdrOle2Obj*) pSdrObj)->SetProgName( rtl::OUString( "StarOrg" ) );
BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_ORGCHART ) );
Graphic aGraphic( aBmpEx );
( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic);
@@ -343,7 +343,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const
case PRESOBJ_CALC:
{
pSdrObj = new SdrOle2Obj();
- ( (SdrOle2Obj*) pSdrObj)->SetProgName( String( RTL_CONSTASCII_USTRINGPARAM( "StarCalc" )));
+ ( (SdrOle2Obj*) pSdrObj)->SetProgName( rtl::OUString( "StarCalc" ) );
BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_TABLE ) );
Graphic aGraphic( aBmpEx );
( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic);
diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx
index 8c3e40086a8d..7bf101e2ec72 100644
--- a/sd/source/core/sdpage_animations.cxx
+++ b/sd/source/core/sdpage_animations.cxx
@@ -62,11 +62,11 @@ Reference< XAnimationNode > SdPage::getAnimationNode() throw (RuntimeException)
{
if( !mxAnimationNode.is() )
{
- mxAnimationNode = Reference< XAnimationNode >::query(::comphelper::getProcessServiceFactory()->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.animations.ParallelTimeContainer"))));
+ mxAnimationNode = Reference< XAnimationNode >::query(::comphelper::getProcessServiceFactory()->createInstance("com.sun.star.animations.ParallelTimeContainer"));
if( mxAnimationNode.is() )
{
Sequence< ::com::sun::star::beans::NamedValue > aUserData( 1 );
- aUserData[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "node-type" ) );
+ aUserData[0].Name = "node-type";
aUserData[0].Value <<= ::com::sun::star::presentation::EffectNodeType::TIMING_ROOT;
mxAnimationNode->setUserData( aUserData );
}
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index a9b623a2bc5e..f3dcfaf6da19 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -187,7 +187,7 @@ SdStyleSheet* SdStyleFamily::GetSheetByName( const OUString& rName ) throw(NoSuc
OUString SAL_CALL SdStyleFamily::getImplementationName() throw(RuntimeException)
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM("SdStyleFamily") );
+ return OUString( "SdStyleFamily" );
}
// ----------------------------------------------------------
@@ -201,7 +201,7 @@ sal_Bool SAL_CALL SdStyleFamily::supportsService( const OUString& ServiceName )
Sequence< OUString > SAL_CALL SdStyleFamily::getSupportedServiceNames() throw(RuntimeException)
{
- OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.StyleFamily") );
+ OUString aServiceName( "com.sun.star.style.StyleFamily" );
Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
@@ -565,7 +565,7 @@ Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (Unkno
}
else
{
- throw UnknownPropertyException( OUString( RTL_CONSTASCII_USTRINGPARAM("unknown property: ") ) + PropertyName, static_cast<OWeakObject *>(this) );
+ throw UnknownPropertyException( "unknown property: " + PropertyName, static_cast<OWeakObject *>(this) );
}
}
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 3625bbf196c7..ee07a24f888a 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1111,7 +1111,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
Font SdStyleSheetPool::GetBulletFont() const
{
- Font aBulletFont( String( RTL_CONSTASCII_USTRINGPARAM( "StarSymbol" )), Size(0, 1000) );
+ Font aBulletFont( OUString( "StarSymbol" ), Size(0, 1000) );
aBulletFont.SetCharSet(RTL_TEXTENCODING_UNICODE);
aBulletFont.SetWeight(WEIGHT_NORMAL);
aBulletFont.SetUnderline(UNDERLINE_NONE);
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index ebbce7676c4f..05058e2068c3 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -670,7 +670,7 @@ void SdStyleSheet::SetHelpId( const String& r, sal_uLong nId )
if( (nId >= HID_PSEUDOSHEET_OUTLINE1) && ( nId <= HID_PSEUDOSHEET_OUTLINE9 ) )
{
- msApiName = OUString( RTL_CONSTASCII_USTRINGPARAM("outline") );
+ msApiName = "outline";
msApiName += OUString( (sal_Unicode)( '1' + (nId - HID_PSEUDOSHEET_OUTLINE1) ) );
}
else
@@ -726,11 +726,11 @@ OUString SdStyleSheet::GetFamilyString( SfxStyleFamily eFamily )
switch( eFamily )
{
case SD_STYLE_FAMILY_CELL:
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "cell" ) );
+ return OUString( "cell" );
default:
OSL_FAIL( "SdStyleSheet::GetFamilyString(), illegal family!" );
case SD_STYLE_FAMILY_GRAPHICS:
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "graphics" ) );
+ return OUString( "graphics" );
}
}
@@ -746,7 +746,7 @@ void SdStyleSheet::throwIfDisposed() throw (RuntimeException)
SdStyleSheet* SdStyleSheet::CreateEmptyUserStyle( SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily )
{
- OUString aPrefix( RTL_CONSTASCII_USTRINGPARAM("user") );
+ OUString aPrefix( "user" );
OUString aName;
sal_Int32 nIndex = 1;
do
@@ -823,10 +823,7 @@ void SAL_CALL SdStyleSheet::dispose( ) throw (RuntimeException)
}
catch (const Exception & exc)
{
- throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "unexpected UNO exception caught: ") ) +
- exc.Message, Reference< XInterface >() );
+ throw RuntimeException( "unexpected UNO exception caught: " + exc.Message, Reference< XInterface >() );
}
}
}
@@ -911,7 +908,7 @@ void SdStyleSheet::notifyModifyListener()
OUString SAL_CALL SdStyleSheet::getImplementationName() throw(RuntimeException)
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "SdStyleSheet" ) );
+ return OUString( "SdStyleSheet" );
}
// --------------------------------------------------------------------
@@ -928,16 +925,16 @@ Sequence< OUString > SAL_CALL SdStyleSheet::getSupportedServiceNames() throw(Run
Sequence< OUString > aNameSequence( 10 );
OUString* pStrings = aNameSequence.getArray();
- *pStrings++ = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.Style" ) );
- *pStrings++ = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.FillProperties" ) );
- *pStrings++ = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.LineProperties" ) );
- *pStrings++ = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.ShadowProperties" ) );
- *pStrings++ = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.ConnectorProperties" ) );
- *pStrings++ = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.MeasureProperties" ) );
- *pStrings++ = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.ParagraphProperties" ) );
- *pStrings++ = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterProperties" ) );
- *pStrings++ = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TextProperties" ) );
- *pStrings++ = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.Text" ) );
+ *pStrings++ = "com.sun.star.style.Style";
+ *pStrings++ = "com.sun.star.drawing.FillProperties";
+ *pStrings++ = "com.sun.star.drawing.LineProperties";
+ *pStrings++ = "com.sun.star.drawing.ShadowProperties";
+ *pStrings++ = "com.sun.star.drawing.ConnectorProperties";
+ *pStrings++ = "com.sun.star.drawing.MeasureProperties";
+ *pStrings++ = "com.sun.star.style.ParagraphProperties";
+ *pStrings++ = "com.sun.star.style.CharacterProperties";
+ *pStrings++ = "com.sun.star.drawing.TextProperties";
+ *pStrings++ = "com.sun.star.drawing.Text";
return aNameSequence;
}
@@ -1152,7 +1149,7 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro
if( nFamily == SD_STYLE_FAMILY_MASTERPAGE )
{
const OUString aLayoutName( GetName() );
- aAny <<= aLayoutName.copy( 0, aLayoutName.indexOf(OUString( RTL_CONSTASCII_USTRINGPARAM(SD_LT_SEPARATOR) ) ) );
+ aAny <<= aLayoutName.copy( 0, aLayoutName.indexOf(OUString( SD_LT_SEPARATOR) ) );
}
else
{