[Libreoffice-commits] .: 2 commits - sd/source
Olivier Hallot
ohallot at kemper.freedesktop.org
Sun Apr 15 21:07:35 PDT 2012
sd/source/core/CustomAnimationEffect.cxx | 44 +++++-----
sd/source/core/CustomAnimationPreset.cxx | 57 +++++-------
sd/source/core/EffectMigration.cxx | 2
sd/source/core/TransitionPreset.cxx | 25 ++---
sd/source/core/annotations/Annotation.cxx | 18 +---
sd/source/core/drawdoc4.cxx | 106 ++++++++++++------------
sd/source/core/sdpage.cxx | 6 -
sd/source/core/sdpage_animations.cxx | 4
sd/source/core/stlfamily.cxx | 6 -
sd/source/core/stlpool.cxx | 4
sd/source/core/stlsheet.cxx | 37 +++-----
sd/source/filter/cgm/sdcgmfilter.cxx | 4
sd/source/filter/eppt/eppt.cxx | 79 ++++++++---------
sd/source/filter/eppt/epptso.cxx | 110 ++++++++++++-------------
sd/source/filter/eppt/pptexanimations.cxx | 38 ++++----
sd/source/filter/eppt/pptexsoundcollection.cxx | 2
sd/source/filter/eppt/pptx-epptbase.cxx | 43 ++++-----
sd/source/filter/eppt/pptx-epptooxml.cxx | 14 +--
sd/source/filter/eppt/pptx-stylesheet.cxx | 8 -
sd/source/filter/eppt/pptx-text.cxx | 102 +++++++++++------------
20 files changed, 336 insertions(+), 373 deletions(-)
New commits:
commit 839a8250114dd0352048c4812b6fa71dc9b1c5b3
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Mon Apr 16 01:05:29 2012 -0300
More RTL_CONSTASCII_USTRINGPARAM removals
sd ... filters
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index ee07a24..c1d1701 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1168,7 +1168,7 @@ void SdStyleSheetPool::throwIfDisposed() throw(::com::sun::star::uno::RuntimeExc
OUString SAL_CALL SdStyleSheetPool::getImplementationName() throw(RuntimeException)
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM("SdStyleSheetPool") );
+ return OUString( "SdStyleSheetPool" );
}
// --------------------------------------------------------------------
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index 4c29e76..6c6ef43 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -93,7 +93,7 @@ sal_Bool SdCGMFilter::Import()
if( pLibrary && mxModel.is() )
{
- ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ImportCGM" ) ) ) );
+ ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( "ImportCGM" ) );
::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
sal_uInt32 nRetValue;
@@ -137,7 +137,7 @@ sal_Bool SdCGMFilter::Export()
if( pLibrary && mxModel.is() )
{
- ExportCGM FncCGMExport = reinterpret_cast< ExportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ExportCGM" ) ) ) );
+ ExportCGM FncCGMExport = reinterpret_cast< ExportCGM >( pLibrary->getFunctionSymbol( "ExportCGM" ) );
if( FncCGMExport )
{
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index f3c79df..72bc751 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -106,22 +106,21 @@ void PPTWriter::exportPPTPre( const std::vector< com::sun::star::beans::Property
{
mbStatusIndicator = sal_True;
mnStatMaxValue = ( mnPages + mnMasterPages ) * 5;
- mXStatusIndicator->start( String( RTL_CONSTASCII_USTRINGPARAM( "PowerPoint Export" ) ),
- mnStatMaxValue + ( mnStatMaxValue >> 3 ) );
+ mXStatusIndicator->start( rtl::OUString( "PowerPoint Export" ), mnStatMaxValue + ( mnStatMaxValue >> 3 ) );
}
SvGlobalName aGName( 0x64818d10L, 0x4f9b, 0x11cf, 0x86, 0xea, 0x00, 0xaa, 0x00, 0xb9, 0x29, 0xe8 );
- mrStg->SetClass( aGName, 0, String( RTL_CONSTASCII_USTRINGPARAM( "MS PowerPoint 97" ) ) );
+ mrStg->SetClass( aGName, 0, rtl::OUString("MS PowerPoint 97") );
if ( !ImplCreateCurrentUserStream() )
return;
- mpStrm = mrStg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "PowerPoint Document" ) ) );
+ mpStrm = mrStg->OpenSotStream( rtl::OUString( "PowerPoint Document" ) );
if ( !mpStrm )
return;
if ( !mpPicStrm )
- mpPicStrm = mrStg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "Pictures" ) ) );
+ mpPicStrm = mrStg->OpenSotStream( rtl::OUString( "Pictures" ) );
const String sBaseURI( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" ) );
std::vector< com::sun::star::beans::PropertyValue >::const_iterator aIter( rMediaData.begin() );
@@ -144,7 +143,7 @@ void PPTWriter::exportPPTPost( )
if ( mbStatusIndicator )
{
- mXStatusIndicator->setText( String( RTL_CONSTASCII_USTRINGPARAM( "PowerPoint Export" ) ) );
+ mXStatusIndicator->setText( rtl::OUString( "PowerPoint Export" ) );
sal_uInt32 nValue = mnStatMaxValue + ( mnStatMaxValue >> 3 );
if ( nValue > mnLatestStatValue )
{
@@ -190,9 +189,9 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
sal_Bool bVisible = sal_True;
::com::sun::star::presentation::FadeEffect eFe = ::com::sun::star::presentation::FadeEffect_NONE;
- if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) ) ) )
+ if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Visible" ) ) )
aAny >>= bVisible;
- if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Change" ) ) ) )
+ if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Change" ) ) )
{
switch ( *(sal_Int32*)aAny.getValue() )
{
@@ -205,7 +204,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
break;
}
}
- if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Effect" ) ) ) )
+ if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Effect" ) ) )
aAny >>= eFe;
sal_uInt32 nSoundRef = 0;
@@ -213,7 +212,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
sal_Bool bStopSound = sal_False;
sal_Bool bLoopSound = sal_False;
- if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Sound" ) ) ) )
+ if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Sound" ) ) )
{
rtl::OUString aSoundURL;
if ( aAny >>= aSoundURL )
@@ -224,7 +223,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
else
aAny >>= bStopSound;
}
- if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LoopSound" ) ) ) )
+ if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "LoopSound" ) ) )
aAny >>= bLoopSound;
sal_Bool bNeedsSSSlideInfoAtom = ( bVisible == sal_False )
@@ -240,18 +239,18 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
sal_Int32 nSlideTime = 0; // muss noch !!!
sal_uInt8 nSpeed = 1;
- if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) ) ) )
+ if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Speed" ) ) )
{
::com::sun::star::presentation::AnimationSpeed aAs;
aAny >>= aAs;
nSpeed = (sal_uInt8)aAs;
}
sal_Int16 nTT = 0;
- if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TransitionType" ) ) )
+ if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "TransitionType" ) )
&& ( aAny >>= nTT ) )
{
sal_Int16 nTST = 0;
- if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TransitionSubtype" ) ) )
+ if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "TransitionSubtype" ) )
&& ( aAny >>= nTST ) )
nTransitionType = GetTransition( nTT, nTST, eFe, nDirection );
@@ -269,7 +268,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
if ( bStopSound )
nBuildFlags |= 256;
- if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Duration" ) ) ) )// duration of this slide
+ if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Duration" ) ) )// duration of this slide
nSlideTime = *(sal_Int32*)aAny.getValue() << 10; // in ticks
mpPptEscherEx->AddAtom( 16, EPP_SSSlideInfoAtom );
@@ -476,7 +475,7 @@ PPTWriter::~PPTWriter()
sal_Bool PPTWriter::ImplCreateCurrentUserStream()
{
- mpCurUserStrm = mrStg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "Current User" ) ) );
+ mpCurUserStrm = mrStg->OpenSotStream( rtl::OUString( "Current User" ) );
if ( !mpCurUserStrm )
return sal_False;
char pUserName[] = "Current User";
@@ -539,9 +538,7 @@ sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation()
if ( mnCnvrtFlags & 0x8000 )
{
uno::Sequence<sal_uInt8> aThumbSeq;
- if ( GetPageByIndex( 0, NORMAL ) &&
- ImplGetPropertyValue( mXPagePropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "PreviewBitmap" ) ) ) )
+ if ( GetPageByIndex( 0, NORMAL ) && ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "PreviewBitmap" ) ) )
{
aThumbSeq =
*static_cast<const uno::Sequence<sal_uInt8>*>(mAny.getValue());
@@ -582,17 +579,17 @@ void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, ::com::sun::star
{
rtl::OUString aString;
::com::sun::star::uno::Any aAny;
- if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "HeaderText" ) ), sal_True ) )
+ if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "HeaderText" ), sal_True ) )
{
if ( aAny >>= aString )
PPTWriter::WriteCString( rStrm, aString, 1 );
}
- if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FooterText" ) ), sal_True ) )
+ if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "FooterText" ), sal_True ) )
{
if ( aAny >>= aString )
PPTWriter::WriteCString( rStrm, aString, 2 );
}
- if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "DateTimeText" ) ), sal_True ) )
+ if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "DateTimeText" ), sal_True ) )
{
if ( aAny >>= aString )
PPTWriter::WriteCString( rStrm, aString, 0 );
@@ -609,34 +606,34 @@ void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com
sal_Bool bVal = sal_False;
sal_uInt32 nVal = 0;
::com::sun::star::uno::Any aAny;
- if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsHeaderVisible" ) ), sal_True ) )
+ if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "IsHeaderVisible" ), sal_True ) )
{
if ( ( aAny >>= bVal ) && bVal )
nVal |= 0x100000;
}
- if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFooterVisible" ) ), sal_True ) )
+ if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "IsFooterVisible" ), sal_True ) )
{
if ( ( aAny >>= bVal ) && bVal )
nVal |= 0x200000;
}
- if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsDateTimeVisible" ) ), sal_True ) )
+ if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "IsDateTimeVisible" ), sal_True ) )
{
if ( ( aAny >>= bVal ) && bVal )
nVal |= 0x010000;
}
- if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsPageNumberVisible" ) ), sal_True ) )
+ if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "IsPageNumberVisible" ), sal_True ) )
{
if ( ( aAny >>= bVal ) && bVal )
nVal |= 0x080000;
}
- if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsDateTimeFixed" ) ), sal_True ) )
+ if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "IsDateTimeFixed" ), sal_True ) )
{
if ( ( aAny >>= bVal ) && !bVal )
nVal |= 0x20000;
else
nVal |= 0x40000;
}
- if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "DateTimeFormat" ) ), sal_True ) )
+ if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "DateTimeFormat" ), sal_True ) )
{
sal_Int32 nFormat = *(sal_Int32*)aAny.getValue();
SvxDateFormat eDateFormat = (SvxDateFormat)( nFormat & 0xf );
@@ -802,7 +799,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
// Bit 7 loop continously
// Bit ? show scrollbar
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CustomShow" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CustomShow" ) ) )
{
aCustomShow = ( *(::rtl::OUString*)mAny.getValue() );
if ( !aCustomShow.isEmpty() )
@@ -812,7 +809,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
}
if ( ( nFlags & 8 ) == 0 )
{
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "FirstPage" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "FirstPage" ) ) )
{
::rtl::OUString aSlideName( *(::rtl::OUString*)mAny.getValue() );
@@ -828,7 +825,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
}
}
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsAutomatic" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString("IsAutomatic" ) ) )
{
sal_Bool bBool = sal_False;
mAny >>= bBool;
@@ -836,14 +833,14 @@ sal_Bool PPTWriter::ImplCreateDocument()
nFlags |= 1;
}
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsEndless" ) ) ) ) // muesste eigendlich heissen IsNotEndless !=)"�()&
+ if ( ImplGetPropertyValue( rtl::OUString( "IsEndless" ) ) ) // muesste eigendlich heissen IsNotEndless !=)"�()&
{
sal_Bool bBool = sal_False;
mAny >>= bBool;
if ( bBool )
nFlags |= 0x80;
}
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsFullScreen" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "IsFullScreen" ) ) )
{
sal_Bool bBool = sal_False;
mAny >>= bBool;
@@ -1223,7 +1220,7 @@ void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::su
EscherPropertyContainer aPropOpt( mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aRect );
aPropOpt.AddOpt( ESCHER_Prop_fillType, ESCHER_FillSolid );
::com::sun::star::drawing::FillStyle aFS( ::com::sun::star::drawing::FillStyle_NONE );
- if ( ImplGetPropertyValue( rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ) ) )
+ if ( ImplGetPropertyValue( rXPropSet, rtl::OUString( "FillStyle" ) ) )
mAny >>= aFS;
switch( aFS )
@@ -1238,16 +1235,16 @@ void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::su
break;
case ::com::sun::star::drawing::FillStyle_BITMAP :
- aPropOpt.CreateGraphicProperties( rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapURL" ) ), sal_True );
+ aPropOpt.CreateGraphicProperties( rXPropSet, rtl::OUString( "FillBitmapURL" ), sal_True );
break;
case ::com::sun::star::drawing::FillStyle_HATCH :
- aPropOpt.CreateGraphicProperties( rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillHatch" ) ), sal_True );
+ aPropOpt.CreateGraphicProperties( rXPropSet, rtl::OUString( "FillHatch" ), sal_True );
break;
case ::com::sun::star::drawing::FillStyle_SOLID :
{
- if ( ImplGetPropertyValue( rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ) ) )
+ if ( ImplGetPropertyValue( rXPropSet, rtl::OUString( "FillColor" ) ) )
{
nFillColor = mpPptEscherEx->GetColor( *((sal_uInt32*)mAny.getValue()) );
nFillBackColor = nFillColor ^ 0xffffff;
@@ -1507,15 +1504,15 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI SaveVBA( SfxObjectShell
{
SvStorageRef xDest( new SvStorage( new SvMemoryStream(), sal_True ) );
SvxImportMSVBasic aMSVBas( rDocShell, *xDest, sal_False, sal_False );
- aMSVBas.SaveOrDelMSVBAStorage( sal_True, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
+ aMSVBas.SaveOrDelMSVBAStorage( sal_True, rtl::OUString( "_MS_VBA_Overhead" ) );
- SvStorageRef xOverhead = xDest->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
+ SvStorageRef xOverhead = xDest->OpenSotStorage( rtl::OUString( "_MS_VBA_Overhead") );
if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) )
{
- SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
+ SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( rtl::OUString( "_MS_VBA_Overhead") );
if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) )
{
- SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead2") ) );
+ SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( rtl::OUString( "_MS_VBA_Overhead2") );
if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) )
{
sal_uInt32 nLen = xTemp->GetSize();
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 1b1aa5b..3547dea 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -837,7 +837,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
{
sal_Bool bIsDark = sal_False;
::com::sun::star::uno::Any aAny;
- if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundDark" ) ), sal_True ) )
+ if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "IsBackgroundDark" ), sal_True ) )
aAny >>= bIsDark;
nBulletColor = bIsDark ? 0xffffff : 0x000000;
}
@@ -886,7 +886,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
{
sal_Bool bIsDark = sal_False;
::com::sun::star::uno::Any aAny;
- if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundDark" ) ), sal_True ) )
+ if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "IsBackgroundDark" ), sal_True ) )
aAny >>= bIsDark;
nCharColor = bIsDark ? 0xffffff : 0x000000;
}
@@ -904,7 +904,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
::com::sun::star::uno::Any aAny;
::com::sun::star::drawing::FillStyle aFS( ::com::sun::star::drawing::FillStyle_NONE );
- if ( PropValue::GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ) ) )
+ if ( PropValue::GetPropertyValue( aAny, mXPropSet, rtl::OUString( "FillStyle" ) ) )
aAny >>= aFS;
switch( aFS )
{
@@ -919,7 +919,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
break;
case ::com::sun::star::drawing::FillStyle_SOLID :
{
- if ( PropValue::GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ) ) )
+ if ( PropValue::GetPropertyValue( aAny, mXPropSet, rtl::OUString( "FillColor" ) ) )
nBackgroundColor = mpPptEscherEx->GetColor( *((sal_uInt32*)aAny.getValue()) );
}
break;
@@ -927,7 +927,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
{
::com::sun::star::uno::Any aBackAny;
::com::sun::star::drawing::FillStyle aBackFS( ::com::sun::star::drawing::FillStyle_NONE );
- if ( PropValue::GetPropertyValue( aBackAny, mXBackgroundPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ) ) )
+ if ( PropValue::GetPropertyValue( aBackAny, mXBackgroundPropSet, rtl::OUString( "FillStyle" ) ) )
aBackAny >>= aBackFS;
switch( aBackFS )
{
@@ -942,7 +942,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
break;
case ::com::sun::star::drawing::FillStyle_SOLID :
{
- if ( PropValue::GetPropertyValue( aAny, mXBackgroundPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ) ) )
+ if ( PropValue::GetPropertyValue( aAny, mXBackgroundPropSet, rtl::OUString( "FillColor" ) ) )
nBackgroundColor = mpPptEscherEx->GetColor( *((sal_uInt32*)aAny.getValue()) );
}
break;
@@ -976,7 +976,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
if ( aPropSetOfNextShape.is() )
{
if ( PropValue::GetPropertyValue( aAny, aPropSetOfNextShape,
- String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ), sal_True ) )
+ rtl::OUString( "FillColor" ), sal_True ) )
{
if ( nCharColor == mpPptEscherEx->GetColor( *((sal_uInt32*)aAny.getValue()) ) )
{
@@ -1065,7 +1065,7 @@ sal_Bool PPTWriter::ImplGetText()
{
mnTextSize = mXText->getString().getLength();
::com::sun::star::uno::Any aAny;
- if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FontIndependentLineSpacing" ) ) ), sal_True )
+ if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "FontIndependentLineSpacing" ) ), sal_True )
aAny >>= mbFontIndependentLineSpacing;
}
return ( mnTextSize != 0 );
@@ -1233,9 +1233,9 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
{
nPageIndex = pIter - maSlideNameList.begin();
aPageUrl = rtl::OUString::valueOf(static_cast<sal_Int32>(256 + nPageIndex));
- aPageUrl.Append( String( RTL_CONSTASCII_USTRINGPARAM( "," ) ) );
+ aPageUrl.Append( rtl::OUString( "," ) );
aPageUrl.Append( String::CreateFromInt32( nPageIndex + 1 ) );
- aPageUrl.Append( String( RTL_CONSTASCII_USTRINGPARAM( ",Slide " ) ) );
+ aPageUrl.Append( rtl::OUString( ",Slide " ) );
aPageUrl.Append( String::CreateFromInt32( nPageIndex + 1 ) );
}
}
@@ -1932,13 +1932,13 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt,
nFlags |= 4;
if ( eTe != ::com::sun::star::presentation::AnimationEffect_NONE )
nBuildType = 2;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "SoundOn" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "SoundOn" ) ) )
{
sal_Bool bBool(sal_False);
mAny >>= bBool;
if ( bBool )
{
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "Sound" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "Sound" ) ) )
{
nSoundRef = maSoundCollection.GetId( *(::rtl::OUString*)mAny.getValue() );
if ( nSoundRef )
@@ -1948,15 +1948,15 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt,
}
sal_Bool bDimHide = sal_False;
sal_Bool bDimPrevious = sal_False;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "DimHide" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "DimHide" ) ) )
mAny >>= bDimHide;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "DimPrevious" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "DimPrevious" ) ) )
mAny >>= bDimPrevious;
if ( bDimPrevious )
nAfterEffect |= 1;
if ( bDimHide )
nAfterEffect |= 2;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "DimColor" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "DimColor" ) ) )
nDimColor = mpPptEscherEx->GetColor( *((sal_uInt32*)mAny.getValue()) ) | 0xfe000000;
rSt << nDimColor << nFlags << nSoundRef << nDelayTime
@@ -2023,13 +2023,13 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat
break;
case ::com::sun::star::presentation::ClickAction_SOUND :
{
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "Bookmark" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "Bookmark" ) ) )
nSoundRef = maSoundCollection.GetId( *(::rtl::OUString*)mAny.getValue() );
}
break;
case ::com::sun::star::presentation::ClickAction_PROGRAM :
{
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "Bookmark" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "Bookmark" ) ) )
{
INetURLObject aUrl( *(::rtl::OUString*)mAny.getValue() );
if ( INET_PROT_FILE == aUrl.GetProtocol() )
@@ -2043,7 +2043,7 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat
case ::com::sun::star::presentation::ClickAction_BOOKMARK :
{
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "Bookmark" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "Bookmark" ) ) )
{
rtl::OUString aBookmark( *(::rtl::OUString*)mAny.getValue() );
sal_uInt32 nIndex = 0;
@@ -2058,9 +2058,9 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat
String aEmpty;
String aHyperString = rtl::OUString::valueOf(static_cast<sal_Int32>(256 + nIndex));
- aHyperString.Append( String( RTL_CONSTASCII_USTRINGPARAM( "," ) ) );
+ aHyperString.Append( rtl::OUString( "," ) );
aHyperString.Append( String::CreateFromInt32( nIndex + 1 ) );
- aHyperString.Append( String( RTL_CONSTASCII_USTRINGPARAM( ",Slide " ) ) );
+ aHyperString.Append( rtl::OUString( ",Slide " ) );
aHyperString.Append( String::CreateFromInt32( nIndex + 1 ) );
nHyperLinkID = ImplInsertBookmarkURL( aHyperString, 1 | ( nIndex << 8 ) | ( 1 << 31 ), aBookmark, aEmpty, aEmpty, aHyperString );
}
@@ -2071,7 +2071,7 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat
case ::com::sun::star::presentation::ClickAction_DOCUMENT :
{
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "Bookmark" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "Bookmark" ) ) )
{
String aBookmark( *(::rtl::OUString*)mAny.getValue() );
if ( aBookmark.Len() )
@@ -2132,16 +2132,16 @@ sal_Bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com
sal_Bool& bIsSound )
{
::com::sun::star::uno::Any aAny;
- if ( GetPropertyValue( aAny, rPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Effect" ) ) ) )
+ if ( GetPropertyValue( aAny, rPropSet, rtl::OUString( "Effect" ) ) )
aAny >>= eEffect;
else
eEffect = ::com::sun::star::presentation::AnimationEffect_NONE;
- if ( GetPropertyValue( aAny, rPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextEffect" ) ) ) )
+ if ( GetPropertyValue( aAny, rPropSet, rtl::OUString( "TextEffect" ) ) )
aAny >>= eTextEffect;
else
eTextEffect = ::com::sun::star::presentation::AnimationEffect_NONE;
- if ( GetPropertyValue( aAny, rPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "SoundOn" ) ) ) )
+ if ( GetPropertyValue( aAny, rPropSet, rtl::OUString( "SoundOn" ) ) )
aAny >>= bIsSound;
else
bIsSound = sal_False;
@@ -2279,12 +2279,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
::com::sun::star::presentation::AnimationEffect eAe;
::com::sun::star::presentation::AnimationEffect eTe;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "PresentationOrder" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "PresentationOrder" ) ) )
nEffectCount = *(sal_uInt16*)mAny.getValue();
sal_Bool bEffect = ImplGetEffect( mXPropSet, eAe, eTe, bIsSound );
::com::sun::star::presentation::ClickAction eCa = ::com::sun::star::presentation::ClickAction_NONE;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "OnClick" ) ) )
mAny >>= eCa;
sal_Bool bGroup = mType == "drawing.Group";
@@ -2329,16 +2329,16 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
sal_Bool bIsHatching = sal_False;
::com::sun::star::uno::Any aAny;
::com::sun::star::drawing::FillStyle eFS;
- if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFontwork" ) ), sal_True ) )
+ if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "IsFontwork" ), sal_True ) )
aAny >>= bIsFontwork;
- if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ), sal_True ) )
+ if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "FillStyle" ), sal_True ) )
{
aAny >>= eFS;
bIsHatching = eFS == ::com::sun::star::drawing::FillStyle_HATCH;
}
if ( bIsHatching || bIsFontwork || ( mType == "drawing.Measure" ) || ( mType == "drawing.Caption" ) )
{
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "BoundRect" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "BoundRect" ) ) )
{
::com::sun::star::awt::Rectangle aRect( *(::com::sun::star::awt::Rectangle*)mAny.getValue() );
maPosition = MapPoint( ::com::sun::star::awt::Point( aRect.X, aRect.Y ) );
@@ -2362,7 +2362,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( sCustomShapeType == "col-502ad400" || sCustomShapeType == "col-60da8460" )
{ // sj: creating metafile for customshapes that can't be saved to ms format properly
ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer );
- if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False ) )
+ if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "MetaFile" ), sal_False ) )
{
aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
SdrObject* pObj = GetSdrObjectFromXShape( mXShape );
@@ -2392,7 +2392,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
sal_Int32 nRadius = 0;
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CornerRadius" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CornerRadius" ) ) )
{
mAny >>= nRadius;
nRadius = MapSize( ::com::sun::star::awt::Size( nRadius, 0 ) ).Width;
@@ -2422,7 +2422,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
::com::sun::star::drawing::CircleKind eCircleKind( ::com::sun::star::drawing::CircleKind_FULL );
PolyStyle ePolyKind = POLY_CHORD;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CircleKind" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CircleKind" ) ) )
{
mAny >>= eCircleKind;
switch ( eCircleKind )
@@ -2459,10 +2459,10 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
else
{
sal_Int32 nStartAngle, nEndAngle;
- if ( !ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CircleStartAngle" ) ) ) )
+ if ( !ImplGetPropertyValue( rtl::OUString( "CircleStartAngle" ) ) )
continue;
nStartAngle = *( (sal_Int32*)mAny.getValue() );
- if( !ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CircleEndAngle" ) ) ) )
+ if( !ImplGetPropertyValue( rtl::OUString( "CircleEndAngle" ) ) )
continue;
nEndAngle = *( (sal_Int32*)mAny.getValue() );
::com::sun::star::awt::Point aPoint( mXShape->getPosition() );
@@ -2538,7 +2538,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
// try to get the aspect when available
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
xShapeProps( mXShape, ::com::sun::star::uno::UNO_QUERY_THROW );
- xShapeProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Aspect" ) ) ) >>= nAspect;
+ xShapeProps->getPropertyValue( ::rtl::OUString( "Aspect" ) ) >>= nAspect;
}
catch( ::com::sun::star::uno::Exception& )
{}
@@ -2581,7 +2581,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( aUserName.Len() )
{
SvStorageStreamRef xCompObj = xTemp->OpenSotStream(
- String( RTL_CONSTASCII_USTRINGPARAM( "\1CompObj" ) ),
+ rtl::OUString( "\1CompObj" ),
STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYALL );
xCompObj->Seek( STREAM_SEEK_TO_END );
sal_uInt32 nStreamLen = xCompObj->Tell();
@@ -2627,7 +2627,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
sal_uInt32 nSpFlags = SHAPEFLAG_HAVESPT | SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_OLESHAPE;
ImplCreateShape( ESCHER_ShpInst_HostControl, nSpFlags, aSolverContainer );
- if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False ) )
+ if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "MetaFile" ), sal_False ) )
aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
aPropOpt.AddOpt( ESCHER_Prop_pictureId, mnExEmbed );
aPropOpt.AddOpt( ESCHER_Prop_pictureActive, 0x10000 );
@@ -2798,7 +2798,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
have to create a simpe Rectangle with fill bitmap instead (while not allowing BitmapMode_Repeat).
*/
ImplCreateShape( ESCHER_ShpInst_Rectangle, 0xa00, aSolverContainer ); // Flags: Connector | HasSpt
- if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "GraphicURL" ) ), sal_True, sal_True, sal_False ) )
+ if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "GraphicURL" ), sal_True, sal_True, sal_False ) )
{
aPropOpt.AddOpt( ESCHER_Prop_WrapText, ESCHER_WrapNone );
aPropOpt.AddOpt( ESCHER_Prop_AnchorText, ESCHER_AnchorMiddle );
@@ -2812,7 +2812,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
else
{
ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer );
- if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "GraphicURL" ) ), sal_False, sal_True ) )
+ if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "GraphicURL" ), sal_False, sal_True ) )
aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
}
}
@@ -3083,7 +3083,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
// try to get the aspect when available
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
xShapeProps( mXShape, ::com::sun::star::uno::UNO_QUERY_THROW );
- xShapeProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Aspect" ) ) ) >>= nAspect;
+ xShapeProps->getPropertyValue( ::rtl::OUString( "Aspect" ) ) >>= nAspect;
}
catch( ::com::sun::star::uno::Exception& )
{}
@@ -3160,13 +3160,13 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
else if ( (mType.getLength() > 9) && (mType[8] == '3') && (mType[9] == 'D') ) // drawing.3D
{
// SceneObject, CubeObject, SphereObject, LatheObject, ExtrudeObject, PolygonObject
- if ( !ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "Bitmap" ) ) ) )
+ if ( !ImplGetPropertyValue( rtl::OUString( "Bitmap" ) ) )
continue;
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer );
- if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Bitmap" ) ), sal_False ) )
+ if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "Bitmap" ), sal_False ) )
aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
}
else if ( mType == "drawing.Media" )
@@ -3176,7 +3176,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer );
::com::sun::star::uno::Any aAny;
- if ( PropValue::GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MediaURL" ) ), sal_True ) )
+ if ( PropValue::GetPropertyValue( aAny, mXPropSet, rtl::OUString( "MediaURL" ), sal_True ) )
{
rtl::OUString aMediaURL;
if ( (aAny >>= aMediaURL ) && !aMediaURL.isEmpty() )
@@ -3249,7 +3249,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
mnAngle = 0;
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer );
- if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False ) )
+ if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "MetaFile" ), sal_False ) )
aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
}
else
@@ -3448,7 +3448,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
::com::sun::star::uno::Any aAny;
EscherPropertyContainer aPropOpt;
mnAngle = ( PropValue::GetPropertyValue( aAny,
- mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ) ), sal_True ) )
+ mXPropSet, rtl::OUString( "RotateAngle" ), sal_True ) )
? *((sal_Int32*)aAny.getValue() )
: 0;
@@ -3582,9 +3582,9 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
EscherPropertyContainer aPropOpt2;
try
{
- static const rtl::OUString sModel( RTL_CONSTASCII_USTRINGPARAM ( "Model" ) );
- static const rtl::OUString sWidth( RTL_CONSTASCII_USTRINGPARAM ( "Width" ) );
- static const rtl::OUString sHeight( RTL_CONSTASCII_USTRINGPARAM ( "Height" ) );
+ static const rtl::OUString sModel( "Model" );
+ static const rtl::OUString sWidth( "Width" );
+ static const rtl::OUString sHeight( "Height" );
uno::Reference< table::XTable > xTable;
if ( mXPropSet->getPropertyValue( sModel ) >>= xTable )
@@ -3681,7 +3681,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
mnTextSize = mXText->getString().getLength();
::com::sun::star::uno::Any aAny;
- if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FontIndependentLineSpacing" ) ) ), sal_True )
+ if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "FontIndependentLineSpacing" ) ), sal_True )
aAny >>= mbFontIndependentLineSpacing;
EscherPropertyContainer aPropOptSp;
@@ -3713,12 +3713,12 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
}
}
- static const rtl::OUString sTopBorder( String( RTL_CONSTASCII_USTRINGPARAM( "TopBorder" ) ) );
- static const rtl::OUString sBottomBorder( String( RTL_CONSTASCII_USTRINGPARAM( "BottomBorder" ) ) );
- static const rtl::OUString sLeftBorder( String( RTL_CONSTASCII_USTRINGPARAM( "LeftBorder" ) ) );
- static const rtl::OUString sRightBorder( String( RTL_CONSTASCII_USTRINGPARAM( "RightBorder" ) ) );
- static const rtl::OUString sDiagonalTLBR( RTL_CONSTASCII_USTRINGPARAM ( "DiagonalTLBR" ) );
- static const rtl::OUString sDiagonalBLTR( RTL_CONSTASCII_USTRINGPARAM ( "DiagonalBLTR" ) );
+ static const rtl::OUString sTopBorder( "TopBorder" );
+ static const rtl::OUString sBottomBorder( "BottomBorder" );
+ static const rtl::OUString sLeftBorder( "LeftBorder" );
+ static const rtl::OUString sRightBorder( "RightBorder" );
+ static const rtl::OUString sDiagonalTLBR( "DiagonalTLBR" );
+ static const rtl::OUString sDiagonalBLTR( "DiagonalBLTR" );
// creating horz lines
sal_Int32 nYPos = MapPoint( rXShape->getPosition() ).Y;
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index f9b6694..9ffc748 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -926,7 +926,7 @@ sal_uInt32 AnimationExporter::GetPresetID( const rtl::OUString& rPreset, sal_uIn
sal_uInt32 nPresetId = 0;
bPresetId = sal_False;
- if ( rPreset.match( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ppt_" ) ), 0 ) )
+ if ( rPreset.match( rtl::OUString( "ppt_" ), 0 ) )
{
sal_Int32 nLast = rPreset.lastIndexOf( '_' );
if ( ( nLast != -1 ) && ( ( nLast + 1 ) < rPreset.getLength() ) )
@@ -1445,26 +1445,26 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
{
sal_Int32 nColor = 0;
Sequence< double > aHSL( 3 );
- rtl::OUString aP( RTL_CONSTASCII_USTRINGPARAM( "," ) );
+ rtl::OUString aP( "," );
if ( rSourceValue >>= aHSL )
{
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "hsl(" ) );
+ aDest += "hsl(";
aDest += rtl::OUString::valueOf( (sal_Int32)( aHSL[ 0 ] / ( 360.0 / 255 ) ) );
aDest += aP;
aDest += rtl::OUString::valueOf( (sal_Int32)( aHSL[ 1 ] * 255.0 ) );
aDest += aP;
aDest += rtl::OUString::valueOf( (sal_Int32)( aHSL[ 2 ] * 255.0 ) );
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
+ aDest += ")";
}
else if ( rSourceValue >>= nColor )
{
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "rgb(" ) );
+ aDest += "rgb(";
aDest += rtl::OUString::valueOf( (sal_Int32)( (sal_Int8)nColor ) );
aDest += aP;
aDest += rtl::OUString::valueOf( (sal_Int32)( (sal_Int8)( nColor >> 8 ) ) );
aDest += aP;
aDest += rtl::OUString::valueOf( (sal_Int32)( (sal_Int8)( nColor >> 16 ) ) );
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
+ aDest += ")";
}
}
else if ( rAttributeName == "FillStyle" )
@@ -1473,9 +1473,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
if ( rSourceValue >>= eFillStyle )
{
if ( eFillStyle == ::com::sun::star::drawing::FillStyle_NONE )
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "none" ) ); // ?
+ aDest += "none"; // ?
else
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "solid" ) );
+ aDest += "solid";
}
}
else if ( rAttributeName == "LineStyle" )
@@ -1484,9 +1484,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
if ( rSourceValue >>= eLineStyle )
{
if ( eLineStyle == ::com::sun::star::drawing::LineStyle_NONE )
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) );
+ aDest += "false";
else
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) );
+ aDest += "true";
}
}
else if ( rAttributeName == "CharWeight" )
@@ -1495,9 +1495,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
if ( rSourceValue >>= fFontWeight )
{
if ( fFontWeight == com::sun::star::awt::FontWeight::BOLD )
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "bold" ) );
+ aDest += "bold";
else
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "normal" ) );
+ aDest += "normal";
}
}
else if ( rAttributeName == "CharUnderline" )
@@ -1506,9 +1506,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
if ( rSourceValue >>= nFontUnderline )
{
if ( nFontUnderline == com::sun::star::awt::FontUnderline::NONE )
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) );
+ aDest += "false";
else
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) );
+ aDest += "true";
}
}
else if ( rAttributeName == "CharPosture" )
@@ -1517,9 +1517,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
if ( rSourceValue >>= eFontSlant )
{
if ( eFontSlant == com::sun::star::awt::FontSlant_ITALIC )
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "italic" ) );
+ aDest += "italic";
else
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "normal" ) ); // ?
+ aDest += "normal"; // ?
}
}
else if ( rAttributeName == "Visibility" )
@@ -1528,9 +1528,9 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
if ( rSourceValue >>= bVisible )
{
if ( bVisible )
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "visible" ) );
+ aDest += "visible";
else
- aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "hidden" ) );
+ aDest += "hidden";
}
}
Any aRet;
@@ -1703,7 +1703,7 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X
{
if( nForceAttributeNames == 1 )
{
- aAttributeName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "r" ));
+ aAttributeName = "r";
}
}
sal_Int32 nIndex = 0;
diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx
index 5b277c3..d8c1fdd 100644
--- a/sd/source/filter/eppt/pptexsoundcollection.cxx
+++ b/sd/source/filter/eppt/pptexsoundcollection.cxx
@@ -46,7 +46,7 @@ ExSoundEntry::ExSoundEntry(const rtl::OUString& rString)
::ucbhelper::Content aCnt( aSoundURL,
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
sal_Int64 nVal = 0;
- ::cppu::convertPropertyValue( nVal, aCnt.getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ) ) );
+ ::cppu::convertPropertyValue( nVal, aCnt.getPropertyValue( ::rtl::OUString( "Size" ) ) );
nFileSize = (sal_uInt32)nVal;
}
catch( ::com::sun::star::uno::Exception& )
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index dc3e221..d2d2a89 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -178,7 +178,7 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert
if ( !InitSOIface() )
return;
- FontCollectionEntry aDefaultFontDesc( String( RTL_CONSTASCII_USTRINGPARAM( "Times New Roman" ) ),
+ FontCollectionEntry aDefaultFontDesc( rtl::OUString( "Times New Roman" ),
ROMAN,
awt::FontPitch::VARIABLE,
RTL_TEXTENCODING_MS_1252 );
@@ -188,10 +188,10 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert
return;
sal_Int32 nWidth = 21000;
- if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ) )
+ if ( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Width" ) ) )
mAny >>= nWidth;
sal_Int32 nHeight = 29700;
- if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) )
+ if ( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Height" ) ) )
mAny >>= nHeight;
maNotesPageSize = MapSize( awt::Size( nWidth, nHeight ) );
@@ -200,10 +200,10 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert
return;
nWidth = 28000;
- if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ) )
+ if ( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Width" ) ) )
mAny >>= nWidth;
nHeight = 21000;
- if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) )
+ if ( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Height" ) ) )
mAny >>= nHeight;
maDestPageSize = MapSize( awt::Size( nWidth, nHeight ) );
@@ -334,7 +334,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
/* try to get the "real" background PropertySet. If the normal page is not supporting this property, it is
taken the property from the master */
- sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ), sal_True );
+ sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Background" ), sal_True );
if ( bHasBackground )
bHasBackground = ( aAny >>= mXBackgroundPropSet );
if ( !bHasBackground )
@@ -351,8 +351,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
( aXMasterDrawPage, UNO_QUERY );
if ( aXMasterPagePropSet.is() )
{
- sal_Bool bBackground = GetPropertyValue( aAny, aXMasterPagePropSet,
- String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) );
+ sal_Bool bBackground = GetPropertyValue( aAny, aXMasterPagePropSet, rtl::OUString( "Background" ) );
if ( bBackground )
{
aAny >>= mXBackgroundPropSet;
@@ -379,7 +378,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
SetCurrentStyleSheet( nMasterNum );
Reference< XPropertySet > aXBackgroundPropSet;
- sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) );
+ sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Background" ) );
if ( bHasBackground )
bHasBackground = ( aAny >>= aXBackgroundPropSet );
@@ -398,7 +397,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
}
}
*/
- if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundObjectsVisible" ) ) ) )
+ if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "IsBackgroundObjectsVisible" ) ) )
{
sal_Bool bBackgroundObjectsVisible = sal_False;
if ( aAny >>= bBackgroundObjectsVisible )
@@ -434,7 +433,7 @@ sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum )
return sal_False;
SetCurrentStyleSheet( nPageNum );
- if ( !ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) ) ) // Backgroundshape laden
+ if ( !ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Background" ) ) ) // Backgroundshape laden
return sal_False;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet;
if ( !( mAny >>= aXBackgroundPropSet ) )
@@ -451,7 +450,7 @@ sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference
{
::com::sun::star::uno::Any aAny;
sal_Int32 nLayout = 20;
- if ( GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Layout" ) ) ), sal_True )
+ if ( GetPropertyValue( aAny, rXPropSet, rtl::OUString( "Layout" ) ), sal_True )
aAny >>= nLayout;
DBG(printf("GetLayoutOffset %" SAL_PRIdINT32 "\n", nLayout));
@@ -509,7 +508,7 @@ sal_uInt32 PPTWriterBase::GetMasterIndex( PageType ePageType )
if ( aXPropertySet.is() )
{
- if ( ImplGetPropertyValue( aXPropertySet, String( RTL_CONSTASCII_USTRINGPARAM( "Number" ) ) ) )
+ if ( ImplGetPropertyValue( aXPropertySet, rtl::OUString( "Number" ) ) )
nRetValue |= *(sal_Int16*)mAny.getValue();
if ( nRetValue & 0xffff ) // ueberlauf vermeiden
nRetValue--;
@@ -556,7 +555,7 @@ sal_Bool PPTWriterBase::GetStyleSheets()
Reference< XPropertySet >
aXPropSet( mXModel, UNO_QUERY );
- sal_uInt16 nDefaultTab = ( aXPropSet.is() && ImplGetPropertyValue( aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TabStop" ) ) ) )
+ sal_uInt16 nDefaultTab = ( aXPropSet.is() && ImplGetPropertyValue( aXPropSet, rtl::OUString( "TabStop" ) ) )
? (sal_uInt16)( *(sal_Int32*)mAny.getValue() / 4.40972 )
: 1250;
@@ -581,25 +580,25 @@ sal_Bool PPTWriterBase::GetStyleSheets()
case EPP_TEXTTYPE_CenterTitle :
case EPP_TEXTTYPE_Title :
{
- aStyle = String( RTL_CONSTASCII_USTRINGPARAM( "title" ) );
+ aStyle = rtl::OUString( "title" );
aFamily = aXNamed->getName();
}
break;
case EPP_TEXTTYPE_Body :
{
- aStyle = String( RTL_CONSTASCII_USTRINGPARAM( "outline1" ) ); // SD_LT_SEPARATOR
+ aStyle = rtl::OUString( "outline1" ); // SD_LT_SEPARATOR
aFamily = aXNamed->getName();
}
break;
case EPP_TEXTTYPE_Other :
{
- aStyle = String( RTL_CONSTASCII_USTRINGPARAM( "standard" ) );
- aFamily = String( RTL_CONSTASCII_USTRINGPARAM( "graphics" ) );
+ aStyle = rtl::OUString( "standard" );
+ aFamily = rtl::OUString( "graphics" );
}
break;
case EPP_TEXTTYPE_CenterBody :
{
- aStyle = String( RTL_CONSTASCII_USTRINGPARAM( "subtitle" ) );
+ aStyle = rtl::OUString( "subtitle" );
aFamily = aXNamed->getName();
}
break;
@@ -774,14 +773,14 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup )
mType = aTypeBuffer.makeStringAndClear();
mbPresObj = mbEmptyPresObj = sal_False;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsPresentationObject" ) ) ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "IsPresentationObject" ) ) )
mAny >>= mbPresObj;
- if ( mbPresObj && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsEmptyPresentationObject" ) ) ) )
+ if ( mbPresObj && ImplGetPropertyValue( rtl::OUString( "IsEmptyPresentationObject" ) ) )
mAny >>= mbEmptyPresObj;
mnAngle = ( PropValue::GetPropertyValue( aAny,
- mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ) ), sal_True ) )
+ mXPropSet, rtl::OUString( "RotateAngle" ), sal_True ) )
? *((sal_Int32*)aAny.getValue() )
: 0;
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index c72bb64..dd36bd7 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -357,7 +357,7 @@ bool PowerPointExport::exportDocument() throw()
mXModel.set( getModel(), UNO_QUERY );
mXStatusIndicator.set( getStatusIndicator(), UNO_QUERY );
- rtl::OUString sBaseURI( RTL_CONSTASCII_USTRINGPARAM("BaseURI") );
+ rtl::OUString sBaseURI( "BaseURI");
std::vector< PropertyValue > aProperties;
PropertyValue aProperty;
aProperty.Name = sBaseURI;
@@ -391,7 +391,7 @@ bool PowerPointExport::exportDocument() throw()
::oox::ole::VbaProject* PowerPointExport::implCreateVbaProject() const
{
- return new ::oox::ole::VbaProject( getComponentContext(), getModel(), CREATE_OUSTRING( "Impress" ) );
+ return new ::oox::ole::VbaProject( getComponentContext(), getModel(), "Impress" );
}
void PowerPointExport::ImplWriteBackground( FSHelperPtr pFS, Reference< XPropertySet > rXPropSet )
@@ -446,7 +446,7 @@ void PowerPointExport::ImplWriteBackground( FSHelperPtr pFS, Reference< XPropert
</p:grpSpPr>"
#define GETA(propName) \
- ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( #propName ) ) )
+ ImplGetPropertyValue( mXPagePropSet, rtl::OUString( #propName ) )
#define GET(variable, propName) \
if ( GETA(propName) ) \
@@ -2123,7 +2123,7 @@ sal_Bool PowerPointExport::WriteNotesMaster()
pFS->startElementNS( XML_p, XML_cSld, FSEND );
Reference< XPropertySet > aXBackgroundPropSet;
- if( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) ) &&
+ if( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Background" ) ) &&
( mAny >>= aXBackgroundPropSet ) )
ImplWriteBackground( pFS, aXBackgroundPropSet );
@@ -2162,16 +2162,14 @@ sal_Bool PowerPointExport::ImplCreateMainNotes()
return sal_True;
}
-#define IMPL_NAME "com.sun.star.comp.Impress.oox.PowerPointExport"
-
OUString SAL_CALL PowerPointExport_getImplementationName() throw()
{
- return CREATE_OUSTRING( IMPL_NAME );
+ return OUString( "com.sun.star.comp.Impress.oox.PowerPointExport" );
}
uno::Sequence< OUString > SAL_CALL PowerPointExport_getSupportedServiceNames() throw()
{
- const OUString aServiceName = CREATE_OUSTRING( "com.sun.star.comp.ooxpptx" );
+ const OUString aServiceName( "com.sun.star.comp.ooxpptx" );
const Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx
index e287805..1de6138 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -117,7 +117,7 @@ void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo
{
sal_Bool bIsDark = sal_False;
::com::sun::star::uno::Any aAny;
- if ( PropValue::GetPropertyValue( aAny, rPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundDark" ) ), sal_True ) )
+ if ( PropValue::GetPropertyValue( aAny, rPagePropSet, rtl::OUString( "IsBackgroundDark" ), sal_True ) )
aAny >>= bIsDark;
nFontColor = bIsDark ? 0xffffff : 0x000000;
}
@@ -248,9 +248,7 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co
if ( nLineSpacing > 0 ) // if nLinespacing is < 0 the linespacing is an absolute spacing
{
sal_Bool bFixedLineSpacing = sal_False;
- uno::Any aAny = rXPropSet->getPropertyValue( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "FontIndependentLineSpacing" ) ) );
+ uno::Any aAny = rXPropSet->getPropertyValue( ::rtl::OUString( "FontIndependentLineSpacing" ) );
if( !(aAny >>= bFixedLineSpacing) || !bFixedLineSpacing )
{
const FontCollectionEntry* pDesc = rFontCollection.GetById( rCharLevel.mnFont );
@@ -362,7 +360,7 @@ void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo
{
sal_Bool bIsDark = sal_False;
::com::sun::star::uno::Any aAny;
- if ( PropValue::GetPropertyValue( aAny, rPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundDark" ) ), sal_True ) )
+ if ( PropValue::GetPropertyValue( aAny, rPagePropSet, rtl::OUString( "IsBackgroundDark" ), sal_True ) )
aAny >>= bIsDark;
nBulletColor = bIsDark ? 0xffffff : 0x000000;
}
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index ad0d11a..915e97b 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -119,7 +119,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text
}
sal_Bool bSymbol = sal_False;
- if ( bPropSetsValid && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" ) ), sal_False ) )
+ if ( bPropSetsValid && ImplGetPropertyValue( rtl::OUString( "CharFontCharSet" ), sal_False ) )
{
sal_Int16 nCharset = 0;
mAny >>= nCharset;
@@ -228,7 +228,7 @@ void PortionObj::Write( SvStream* pStrm, sal_Bool bLast )
void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue )
{
- sal_Bool bOk = ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ), bGetPropStateValue );
+ sal_Bool bOk = ImplGetPropertyValue( rtl::OUString( "CharFontName" ), bGetPropStateValue );
meFontName = ePropState;
if ( bOk )
{
@@ -238,11 +238,11 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool
if ( mnFont == nCount )
{
FontCollectionEntry& rFontDesc = rFontCollection.GetLast();
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" ) ), sal_False ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CharFontCharSet" ), sal_False ) )
mAny >>= rFontDesc.CharSet;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamily" ) ), sal_False ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CharFontFamily" ), sal_False ) )
mAny >>= rFontDesc.Family;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitch" ) ), sal_False ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CharFontPitch" ), sal_False ) )
mAny >>= rFontDesc.Pitch;
}
}
@@ -255,7 +255,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool
}
if ( nScriptType != com::sun::star::i18n::ScriptType::COMPLEX )
{
- bOk = ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontNameAsian" ) ), bGetPropStateValue );
+ bOk = ImplGetPropertyValue( rtl::OUString( "CharFontNameAsian" ), bGetPropStateValue );
meAsianOrComplexFont = ePropState;
if ( bOk )
{
@@ -265,18 +265,18 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool
if ( mnAsianOrComplexFont == nCount )
{
FontCollectionEntry& rFontDesc = rFontCollection.GetLast();
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSetAsian" ) ), sal_False ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CharFontCharSetAsian" ), sal_False ) )
mAny >>= rFontDesc.CharSet;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamilyAsian" ) ), sal_False ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CharFontFamilyAsian" ), sal_False ) )
mAny >>= rFontDesc.Family;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitchAsian" ) ), sal_False ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CharFontPitchAsian" ), sal_False ) )
mAny >>= rFontDesc.Pitch;
}
}
}
else
{
- bOk = ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontNameComplex" ) ), bGetPropStateValue );
+ bOk = ImplGetPropertyValue( rtl::OUString( "CharFontNameComplex" ), bGetPropStateValue );
meAsianOrComplexFont = ePropState;
if ( bOk )
{
@@ -286,11 +286,11 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool
if ( mnAsianOrComplexFont == nCount )
{
FontCollectionEntry& rFontDesc = rFontCollection.GetLast();
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSetComplex" ) ), sal_False ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CharFontCharSetComplex" ), sal_False ) )
mAny >>= rFontDesc.CharSet;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamilyComplex" ) ), sal_False ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CharFontFamilyComplex" ), sal_False ) )
mAny >>= rFontDesc.Family;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitchComplex" ) ), sal_False ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CharFontPitchComplex" ), sal_False ) )
mAny >>= rFontDesc.Pitch;
}
}
@@ -301,26 +301,26 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool
{
case com::sun::star::i18n::ScriptType::ASIAN :
{
- aCharHeightName = String( RTL_CONSTASCII_USTRINGPARAM( "CharHeightAsian" ) );
- aCharWeightName = String( RTL_CONSTASCII_USTRINGPARAM( "CharWeightAsian" ) );
- aCharLocaleName = String( RTL_CONSTASCII_USTRINGPARAM( "CharLocaleAsian" ) );
- aCharPostureName = String( RTL_CONSTASCII_USTRINGPARAM( "CharPostureAsian" ) );
+ aCharHeightName = "CharHeightAsian";
+ aCharWeightName = "CharWeightAsian";
+ aCharLocaleName = "CharLocaleAsian";
+ aCharPostureName = "CharPostureAsian";
break;
}
case com::sun::star::i18n::ScriptType::COMPLEX :
{
- aCharHeightName = String( RTL_CONSTASCII_USTRINGPARAM( "CharHeightComplex" ) );
- aCharWeightName = String( RTL_CONSTASCII_USTRINGPARAM( "CharWeightComplex" ) );
- aCharLocaleName = String( RTL_CONSTASCII_USTRINGPARAM( "CharLocaleComplex" ) );
- aCharPostureName = String( RTL_CONSTASCII_USTRINGPARAM( "CharPostureComplex" ) );
+ aCharHeightName = "CharHeightComplex";
+ aCharWeightName = "CharWeightComplex";
+ aCharLocaleName = "CharLocaleComplex";
+ aCharPostureName = "CharPostureComplex";
break;
}
default:
{
- aCharHeightName = String( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) );
- aCharWeightName = String( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) );
- aCharLocaleName = String( RTL_CONSTASCII_USTRINGPARAM( "CharLocale" ) );
- aCharPostureName = String( RTL_CONSTASCII_USTRINGPARAM( "CharPosture" ) );
+ aCharHeightName = "CharHeight";
+ aCharWeightName = "CharWeight";
+ aCharLocaleName = "CharLocale";
+ aCharPostureName = "CharPosture";
break;
}
}
@@ -371,7 +371,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool
}
}
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" ) ), bGetPropStateValue ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CharUnderline" ), bGetPropStateValue ) )
{
sal_Int16 nVal(0);
mAny >>= nVal;
@@ -386,7 +386,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool
if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
mnCharAttrHard |= 4;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharShadowed" ) ), bGetPropStateValue ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CharShadowed" ), bGetPropStateValue ) )
{
sal_Bool bBool(sal_False);
mAny >>= bBool;
@@ -396,7 +396,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool
if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
mnCharAttrHard |= 16;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharRelief" ) ), bGetPropStateValue ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CharRelief" ), bGetPropStateValue ) )
{
sal_Int16 nVal(0);
mAny >>= nVal;
@@ -406,7 +406,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool
if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
mnCharAttrHard |= 512;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ), bGetPropStateValue ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CharColor" ), bGetPropStateValue ) )
{
sal_uInt32 nSOColor = *( (sal_uInt32*)mAny.getValue() );
mnCharColor = nSOColor & 0xff00ff00; // green and hibyte
@@ -416,7 +416,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool
meCharColor = ePropState;
mnCharEscapement = 0;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ), bGetPropStateValue ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "CharEscapement" ), bGetPropStateValue ) )
{
mAny >>= mnCharEscapement;
if ( mnCharEscapement > 100 )
@@ -487,7 +487,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
sal_uInt32 nRetValue = 0;
sal_Int32 nFormat;
::com::sun::star::uno::Any aAny;
- if ( GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextPortionType" ) ), sal_True ) )
+ if ( GetPropertyValue( aAny, rXPropSet, rtl::OUString( "TextPortionType" ), sal_True ) )
{
String aTextFieldType( *(::rtl::OUString*)aAny.getValue() );
if ( aTextFieldType == String( RTL_CONSTASCII_USTRINGPARAM( "TextField" ) ) )
@@ -506,13 +506,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
String aFieldKind( aXTextField->getPresentation( sal_True ) );
if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Date" ) ) )
{
- if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
+ if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "IsFix" ) ), sal_True )
{
sal_Bool bBool = sal_False;
aAny >>= bBool;
if ( !bBool ) // Fixed DateFields gibt es in PPT nicht
{
- if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Format" ) ) ), sal_True )
+ if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "Format" ) ), sal_True )
{
nFormat = *(sal_Int32*)aAny.getValue();
switch ( nFormat )
@@ -534,7 +534,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
}
else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) )
{
- if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) ), sal_True )
+ if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "URL" ) ), sal_True )
rURL = String( *(::rtl::OUString*)aAny.getValue() );
nRetValue = 4 << 28;
}
@@ -548,13 +548,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
}
else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Time" ) ) )
{
- if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
+ if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "IsFix" ) ), sal_True )
{
sal_Bool bBool = sal_False;
aAny >>= bBool;
if ( !bBool )
{
- if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
+ if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "IsFix" ) ), sal_True )
{
nFormat = *(sal_Int32*)aAny.getValue();
nRetValue |= ( ( ( 2 << 4 ) | nFormat ) << 24 ) | 0x800000;
@@ -572,13 +572,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
}
else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "ExtTime" ) ) )
{
- if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
+ if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "IsFix" ) ), sal_True )
{
sal_Bool bBool = sal_False;
aAny >>= bBool;
if ( !bBool )
{
- if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Format" ) ) ), sal_True )
+ if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "Format" ) ), sal_True )
{
nFormat = *(sal_Int32*)aAny.getValue();
switch ( nFormat )
@@ -785,23 +785,23 @@ static void lcl_SubstituteBullet(String& rNumStr, rtl_TextEncoding& rChrSet, Str
void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nNumberingDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue )
{
::com::sun::star::uno::Any aAny;
- if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "ParaLeftMargin" ) ) ) )
+ if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "ParaLeftMargin" ) ) )
{
sal_Int32 nVal(0);
if ( aAny >>= nVal )
nTextOfs = static_cast< sal_Int16 >( nVal / ( 2540.0 / 576 ) + 0.5 ) ;
}
- if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "ParaFirstLineIndent" ) ) ) )
+ if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "ParaFirstLineIndent" ) ) )
{
if ( aAny >>= nBulletOfs )
nBulletOfs = static_cast< sal_Int32 >( nBulletOfs / ( 2540.0 / 576 ) + 0.5 );
}
- if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "NumberingIsNumber" ) ) ) )
+ if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "NumberingIsNumber" ) ) )
aAny >>= bNumberingIsNumber;
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > aXIndexReplace;
- if ( bIsBullet && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "NumberingRules" ) ), bGetPropStateValue ) )
+ if ( bIsBullet && ImplGetPropertyValue( rtl::OUString( "NumberingRules" ), bGetPropStateValue ) )
{
if ( ( mAny >>= aXIndexReplace ) && nNumberingDepth < aXIndexReplace->getCount() )
{
@@ -1088,10 +1088,10 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo
}
ImplGetNumberingLevel( rBuProv, nDepth, mbIsBullet, bGetPropStateValue );
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaTabStops" ) ), bGetPropStateValue ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "ParaTabStops" ), bGetPropStateValue ) )
maTabStop = *( ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop>*)mAny.getValue();
sal_Int16 eTextAdjust( ::com::sun::star::style::ParagraphAdjust_LEFT );
- if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "ParaAdjust" ) ), bGetPropStateValue ) )
+ if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "ParaAdjust" ), bGetPropStateValue ) )
aAny >>= eTextAdjust;
switch ( (::com::sun::star::style::ParagraphAdjust)eTextAdjust )
{
@@ -1111,7 +1111,7 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo
}
meTextAdjust = ePropState;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaLineSpacing" ) ), bGetPropStateValue ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "ParaLineSpacing" ), bGetPropStateValue ) )
{
::com::sun::star::style::LineSpacing aLineSpacing
= *( (::com::sun::star::style::LineSpacing*)mAny.getValue() );
@@ -1135,30 +1135,30 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo
}
meLineSpacing = ePropState;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaBottomMargin" ) ), bGetPropStateValue ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "ParaBottomMargin" ), bGetPropStateValue ) )
{
double fSpacing = *( (sal_uInt32*)mAny.getValue() ) + ( 2540.0 / 576.0 ) - 1;
mnLineSpacingBottom = (sal_Int16)(-( fSpacing * 576.0 / 2540.0 ) );
}
meLineSpacingBottom = ePropState;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaTopMargin" ) ), bGetPropStateValue ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "ParaTopMargin" ), bGetPropStateValue ) )
{
double fSpacing = *( (sal_uInt32*)mAny.getValue() ) + ( 2540.0 / 576.0 ) - 1;
mnLineSpacingTop = (sal_Int16)(-( fSpacing * 576.0 / 2540.0 ) );
}
meLineSpacingTop = ePropState;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaIsForbiddenRules" ) ), bGetPropStateValue ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "ParaIsForbiddenRules" ), bGetPropStateValue ) )
mAny >>= mbForbiddenRules;
meForbiddenRules = ePropState;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaIsHangingPunctuation" ) ), bGetPropStateValue ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "ParaIsHangingPunctuation" ), bGetPropStateValue ) )
mAny >>= mbParagraphPunctation;
meParagraphPunctation = ePropState;
mnBiDi = 0;
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "WritingMode" ) ), bGetPropStateValue ) )
+ if ( ImplGetPropertyValue( rtl::OUString( "WritingMode" ), bGetPropStateValue ) )
{
sal_Int16 nWritingMode = 0;
mAny >>= nWritingMode;
@@ -1346,7 +1346,7 @@ FontCollection::FontCollection() :
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
xMSF = ::comphelper::getProcessServiceFactory();
com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
- xInterface = xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.BreakIterator" ) ) );
+ xInterface = xMSF->createInstance( "com.sun.star.i18n.BreakIterator" );
if ( xInterface.is() )
xPPTBreakIter = com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator >
( xInterface, com::sun::star::uno::UNO_QUERY );
commit ff3fd9331dfdbe848c8be2e32cb2e173b96902a4
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Sun Apr 15 23:14:28 2012 -0300
More RTL_CONSTASCII_USTRINGPARAM removals
/sd/../core
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index d87ab92..fe4ebdf 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 1224058..50343d2 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;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list