summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx8
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx40
-rw-r--r--sd/source/ui/animations/motionpathtag.cxx4
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx14
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx4
-rw-r--r--sd/source/ui/app/sddll.cxx4
-rw-r--r--sd/source/ui/app/sdmod.cxx4
-rw-r--r--sd/source/ui/app/sdmod1.cxx4
-rw-r--r--sd/source/ui/app/sdxfer.cxx6
-rw-r--r--sd/source/ui/app/tbxww.cxx4
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.cxx22
13 files changed, 58 insertions, 60 deletions
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index ced683a2ee3d..542411ee6c6d 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -228,7 +228,7 @@ ImplStlEffectCategorySortHelper::ImplStlEffectCategorySortHelper()
uno::Reference<lang::XMultiServiceFactory> xFac( ::comphelper::getProcessServiceFactory() );
if( xFac.is() )
{
- mxCollator.set( xFac->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.Collator" )) ), uno::UNO_QUERY );
+ mxCollator.set( xFac->createInstance( "com.sun.star.i18n.Collator" ), uno::UNO_QUERY );
if( mxCollator.is() )
{
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 8e42e16aa680..a8ad199cadf8 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1999,7 +1999,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
pSet->getPropertyValue( nHandleCurrentPage ) >>= xCurrentPage;
if( xCurrentPage.is() )
{
- const OUString aStrIsEmptyPresObj( RTL_CONSTASCII_USTRINGPARAM( "IsEmptyPresentationObject" ) );
+ const OUString aStrIsEmptyPresObj( "IsEmptyPresentationObject" );
sal_Int32 nShape, nCount = xCurrentPage->getCount();
for( nShape = 0; nShape < nCount; nShape++ )
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index a9502817cd35..761fe3003336 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -134,12 +134,12 @@ OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText
if( xSet.is() )
{
Reference< XPropertySetInfo > xInfo( xSet->getPropertySetInfo() );
- const OUString aPropName( RTL_CONSTASCII_USTRINGPARAM("UINameSingular") );
+ const OUString aPropName( "UINameSingular");
if( xInfo->hasPropertyByName( aPropName ) )
xSet->getPropertyValue( aPropName ) >>= aDescription;
}
- aDescription += OUString( RTL_CONSTASCII_USTRINGPARAM(" "));
+ aDescription += " ";
aDescription += OUString::valueOf( getShapeIndex( xShape ) );
if( bWithText )
@@ -150,7 +150,7 @@ OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText
OUString aText( xText->getString() );
if( !aText.isEmpty() )
{
- aDescription += OUString(RTL_CONSTASCII_USTRINGPARAM(": "));
+ aDescription += ": ";
aText = aText.replace( (sal_Unicode)'\n', (sal_Unicode)' ' );
aText = aText.replace( (sal_Unicode)'\r', (sal_Unicode)' ' );
@@ -670,7 +670,7 @@ void CustomAnimationList::update()
SvLBoxEntry* pLBoxEntry = new CustomAnimationListEntry;
pLBoxEntry->AddItem( new SvLBoxContextBmp( pLBoxEntry, 0, Image(), Image(), 0));
OUString aDescription = String( SdResId( STR_CUSTOMANIMATION_TRIGGER ) );
- aDescription += OUString( RTL_CONSTASCII_USTRINGPARAM(": ") );
+ aDescription += ": ";
aDescription += getShapeDescription( xShape, false );
pLBoxEntry->AddItem( new CustomAnimationTriggerEntryItem( pLBoxEntry, 0, aDescription, this ) );
Insert( pLBoxEntry );
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index f2ec94b5b562..498185fd9d55 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1099,7 +1099,7 @@ static sal_Int32 calcMaxParaDepth( Reference< XShape > xTargetShape )
if( xText.is() )
{
Reference< XPropertySet > xParaSet;
- const OUString strNumberingLevel( RTL_CONSTASCII_USTRINGPARAM("NumberingLevel") );
+ const OUString strNumberingLevel( "NumberingLevel" );
Reference< XEnumeration > xEnumeration( xText->createEnumeration(), UNO_QUERY_THROW );
while( xEnumeration->hasMoreElements() )
@@ -1141,11 +1141,11 @@ Any CustomAnimationPane::getProperty1Value( sal_Int32 nType, CustomAnimationEffe
}
case nPropertyTypeFont:
- return pEffect->getProperty( AnimationNodeType::SET, OUString( RTL_CONSTASCII_USTRINGPARAM("CharFontName") ), VALUE_TO );
+ return pEffect->getProperty( AnimationNodeType::SET, "CharFontName" , VALUE_TO );
case nPropertyTypeCharHeight:
{
- const OUString aAttributeName( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) );
+ const OUString aAttributeName( "CharHeight" );
Any aValue( pEffect->getProperty( AnimationNodeType::SET, aAttributeName, VALUE_TO ) );
if( !aValue.hasValue() )
aValue = pEffect->getProperty( AnimationNodeType::ANIMATE, aAttributeName, VALUE_TO );
@@ -1156,7 +1156,7 @@ Any CustomAnimationPane::getProperty1Value( sal_Int32 nType, CustomAnimationEffe
return pEffect->getTransformationProperty( AnimationTransformType::ROTATE, VALUE_BY);
case nPropertyTypeTransparency:
- return pEffect->getProperty( AnimationNodeType::SET, OUString(RTL_CONSTASCII_USTRINGPARAM("Opacity")), VALUE_TO );
+ return pEffect->getProperty( AnimationNodeType::SET, "Opacity" , VALUE_TO );
case nPropertyTypeScale:
return pEffect->getTransformationProperty( AnimationTransformType::SCALE, VALUE_BY );
@@ -1164,9 +1164,9 @@ Any CustomAnimationPane::getProperty1Value( sal_Int32 nType, CustomAnimationEffe
case nPropertyTypeCharDecoration:
{
Sequence< Any > aValues(3);
- aValues[0] = pEffect->getProperty( AnimationNodeType::SET, OUString(RTL_CONSTASCII_USTRINGPARAM("CharWeight")), VALUE_TO );
- aValues[1] = pEffect->getProperty( AnimationNodeType::SET, OUString(RTL_CONSTASCII_USTRINGPARAM("CharPosture")), VALUE_TO );
- aValues[2] = pEffect->getProperty( AnimationNodeType::SET, OUString(RTL_CONSTASCII_USTRINGPARAM("CharUnderline")), VALUE_TO );
+ aValues[0] = pEffect->getProperty( AnimationNodeType::SET, "CharWeight" , VALUE_TO );
+ aValues[1] = pEffect->getProperty( AnimationNodeType::SET, "CharPosture" , VALUE_TO );
+ aValues[2] = pEffect->getProperty( AnimationNodeType::SET, "CharUnderline" , VALUE_TO );
return makeAny( aValues );
}
}
@@ -1212,12 +1212,12 @@ bool CustomAnimationPane::setProperty1Value( sal_Int32 nType, CustomAnimationEff
break;
case nPropertyTypeFont:
- bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ), VALUE_TO, rValue );
+ bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, "CharFontName" , VALUE_TO, rValue );
break;
case nPropertyTypeCharHeight:
{
- const OUString aAttributeName( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) );
+ const OUString aAttributeName( "CharHeight" );
bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, aAttributeName, VALUE_TO, rValue );
if( !bEffectChanged )
bEffectChanged = pEffect->setProperty( AnimationNodeType::ANIMATE, aAttributeName, VALUE_TO, rValue );
@@ -1228,7 +1228,7 @@ bool CustomAnimationPane::setProperty1Value( sal_Int32 nType, CustomAnimationEff
break;
case nPropertyTypeTransparency:
- bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, OUString( RTL_CONSTASCII_USTRINGPARAM("Opacity") ), VALUE_TO, rValue );
+ bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, "Opacity" , VALUE_TO, rValue );
break;
case nPropertyTypeScale:
@@ -1239,9 +1239,9 @@ bool CustomAnimationPane::setProperty1Value( sal_Int32 nType, CustomAnimationEff
{
Sequence< Any > aValues(3);
rValue >>= aValues;
- bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, OUString(RTL_CONSTASCII_USTRINGPARAM("CharWeight")), VALUE_TO, aValues[0] );
- bEffectChanged |= pEffect->setProperty( AnimationNodeType::SET, OUString(RTL_CONSTASCII_USTRINGPARAM("CharPosture")), VALUE_TO, aValues[1] );
- bEffectChanged |= pEffect->setProperty( AnimationNodeType::SET, OUString(RTL_CONSTASCII_USTRINGPARAM("CharUnderline")), VALUE_TO, aValues[2] );
+ bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, "CharWeight" , VALUE_TO, aValues[0] );
+ bEffectChanged |= pEffect->setProperty( AnimationNodeType::SET, "CharPosture" , VALUE_TO, aValues[1] );
+ bEffectChanged |= pEffect->setProperty( AnimationNodeType::SET, "CharUnderline" , VALUE_TO, aValues[2] );
}
break;
@@ -1259,8 +1259,8 @@ static sal_Bool hasVisibleShape( const Reference< XShape >& xShape )
if( sShapeType == "com.sun.star.presentation.TitleTextShape" || sShapeType == "com.sun.star.presentation.OutlinerShape" ||
sShapeType == "com.sun.star.presentation.SubtitleShape" || sShapeType == "com.sun.star.drawing.TextShape" )
{
- const OUString sFillStyle( RTL_CONSTASCII_USTRINGPARAM("FillStyle" ) );
- const OUString sLineStyle( RTL_CONSTASCII_USTRINGPARAM("LineStyle" ) );
+ const OUString sFillStyle( "FillStyle" );
+ const OUString sLineStyle( "LineStyle" );
Reference< XPropertySet > xSet( xShape, UNO_QUERY_THROW );
FillStyle eFillStyle;
@@ -1376,17 +1376,17 @@ STLPropertySet* CustomAnimationPane::createSelectionSet()
addValue( pSet, nHandleProperty1Value, getProperty1Value( nType, pEffect ) );
}
- if( pDescriptor->hasProperty( OUString( RTL_CONSTASCII_USTRINGPARAM( "Accelerate" ) ) ) )
+ if( pDescriptor->hasProperty( "Accelerate" ) )
{
addValue( pSet, nHandleAccelerate, makeAny( pEffect->getAcceleration() ) );
}
- if( pDescriptor->hasProperty( OUString( RTL_CONSTASCII_USTRINGPARAM( "Decelerate" ) ) ) )
+ if( pDescriptor->hasProperty( "Decelerate" ) )
{
addValue( pSet, nHandleDecelerate, makeAny( pEffect->getDecelerate() ) );
}
- if( pDescriptor->hasProperty( OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoReverse" ) ) ) )
+ if( pDescriptor->hasProperty( "AutoReverse" ) )
{
addValue( pSet, nHandleAutoReverse, makeAny( pEffect->getAutoReverse() ) );
}
@@ -2376,11 +2376,11 @@ void CustomAnimationPane::onPreview( bool bForcePreview )
void CustomAnimationPane::preview( const Reference< XAnimationNode >& xAnimationNode )
{
- Reference< XTimeContainer > xRoot(::comphelper::getProcessServiceFactory()->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.animations.ParallelTimeContainer"))), UNO_QUERY);
+ Reference< XTimeContainer > xRoot(::comphelper::getProcessServiceFactory()->createInstance("com.sun.star.animations.ParallelTimeContainer"), UNO_QUERY);
if( xRoot.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;
xRoot->setUserData( aUserData );
xRoot->appendChild( xAnimationNode );
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index d4cd4b3b2f54..56cd83c904fd 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -388,7 +388,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con
}
XDash aDash( XDASH_RECT, 1, 80, 1, 80, 80);
- String aEmpty( RTL_CONSTASCII_USTRINGPARAM("?") );
+ rtl::OUString aEmpty( "?" );
mpPathObj->SetMergedItem( XLineDashItem( aEmpty, aDash ) );
mpPathObj->SetMergedItem( XLineStyleItem( XLINE_DASH ) );
mpPathObj->SetMergedItem( XLineColorItem(aEmpty, ::Color(COL_GRAY)) );
@@ -431,7 +431,7 @@ MotionPathTag::~MotionPathTag()
void MotionPathTag::updatePathAttributes()
{
- String aEmpty( RTL_CONSTASCII_USTRINGPARAM("?") );
+ rtl::OUString aEmpty( "?" );
::basegfx::B2DPolygon aCandidate;
if( mxPolyPoly.count() )
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 96a03316c0f0..f4831f3c593f 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -179,7 +179,7 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio
Time aTime( aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.HundredthSeconds );
if(aTime.GetTime() != 0)
- sRet = sRet + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) + rLocalData.getTime( aTime,false );
+ sRet = sRet + " " + rLocalData.getTime( aTime,false );
}
return sRet;
}
@@ -474,16 +474,16 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq )
aStr.SearchAndReplaceAscii("%1", sAuthor);
- aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM(" (") ) );
- aStr.Append( String( getAnnotationDateTimeString( xAnnotation ) ) );
- aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM("): \"") ) );
+ aStr.Append( rtl::OUString(" (") );
+ aStr.Append( rtl::OUString( getAnnotationDateTimeString( xAnnotation ) ) );
+ aStr.Append( rtl::OUString("): \"") );
String sQuote( pTextApi->GetText() );
if( sQuote.Len() == 0 )
- sQuote = String( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
+ sQuote = rtl::OUString( "..." );
aStr.Append( sQuote );
- aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM("\"\n") ) );
+ aStr.Append( rtl::OUString("\"\n") );
sal_uInt16 nParaCount = comphelper::string::getTokenCount(aStr, '\n');
for( sal_uInt16 nPara = 0; nPara < nParaCount; nPara++ )
@@ -1051,7 +1051,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation
nId = pMenu->GetItemId( nPos );
if( pMenu->IsItemEnabled( nId ) )
{
- OUString sSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
+ OUString sSlotURL( "slot:" );
sSlotURL += OUString::valueOf( sal_Int32( nId ));
Image aImage( GetImage( xFrame, sSlotURL, false ) );
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 50fe477e350d..d6bc9177f915 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -105,8 +105,6 @@ using namespace ::com::sun::star::text;
#define METABUTTON_AREA_WIDTH 30
#define POSTIT_META_HEIGHT (sal_Int32) 30
-#define EMPTYSTRING rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(""))
-
namespace sd {
extern OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotation );
@@ -579,7 +577,7 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio
if( !sDateTime.isEmpty() )
{
if( !sMeta.isEmpty() )
- sMeta += OUString( RTL_CONSTASCII_USTRINGPARAM( "\n" ) );
+ sMeta += "\n";
sMeta += sDateTime;
}
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 094bbcb53ee5..dad91d7c00fe 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -95,12 +95,12 @@ void SdDLL::Init()
{
// Register the Impress shape types in order to make the shapes accessible.
::accessibility::RegisterImpressShapeTypes ();
- ::sd::DrawDocShell::Factory().SetDocumentServiceName( String( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) );
+ ::sd::DrawDocShell::Factory().SetDocumentServiceName( "com.sun.star.presentation.PresentationDocument" );
}
if (SvtModuleOptions().IsDraw())
{
- ::sd::GraphicDocShell::Factory().SetDocumentServiceName( String( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) );
+ ::sd::GraphicDocShell::Factory().SetDocumentServiceName( "com.sun.star.drawing.DrawingDocument" );
}
// register your view-factories here
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 1b212ac0899c..73382f0f962a 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -93,7 +93,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
bWaterCan(sal_False),
mpResourceContainer(new ::sd::SdGlobalResourceContainer())
{
- SetName( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarDraw" ) ) ); // Nicht uebersetzen!
+ SetName( rtl::OUString( "StarDraw" ) ); // Nicht uebersetzen!
pSearchItem = new SvxSearchItem(SID_SEARCH_ITEM);
pSearchItem->SetAppFlag(SVX_SEARCHAPP_DRAW);
StartListening( *SFX_APP() );
@@ -229,7 +229,7 @@ SvStorageStreamRef SdModule::GetOptionStream( const String& rOptionName,
{
INetURLObject aURL( SvtPathOptions().GetUserConfigPath() );
- aURL.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "drawing.cfg" ) ) );
+ aURL.Append( rtl::OUString( "drawing.cfg" ) );
SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE );
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 2cb4b67ee113..6cdcec121537 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -575,7 +575,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
//we start without wizard
//check whether we should load a template document
- const ::rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) );
+ const ::rtl::OUString aServiceName( "com.sun.star.presentation.PresentationDocument" );
String aStandardTemplate( SfxObjectFactory::GetStandardTemplate( aServiceName ) );
if( aStandardTemplate.Len() > 0 )
@@ -645,7 +645,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
aRequest.AppendItem (aPassword);
aRequest.AppendItem (SfxStringItem (
SID_TARGETNAME,
- String (RTL_CONSTASCII_USTRINGPARAM ("_default"))));
+ rtl::OUString("_default")));
try
{
const SfxPoolItem* pRet = SFX_APP()->ExecuteSlot (aRequest);
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 53c795ddf9b6..2f4c93f67d2c 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -220,14 +220,14 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj )
return;
::com::sun::star::form::FormButtonType eButtonType;
- Any aTmp( xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" ) ) ) );
+ Any aTmp( xPropSet->getPropertyValue( "ButtonType" ) );
if( aTmp >>= eButtonType )
{
::rtl::OUString aLabel, aURL;
- xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" ) ) ) >>= aLabel;
- xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TargetURL") ) ) >>= aURL;
+ xPropSet->getPropertyValue( "Label" ) >>= aLabel;
+ xPropSet->getPropertyValue( "TargetURL" ) >>= aURL;
mpBookmark = new INetBookmark( String( aURL ), String( aLabel ) );
}
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index f562f4b5fc0b..b7a53a64458c 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -82,7 +82,7 @@ SfxPopupWindow* SdTbxControl::CreatePopupWindow()
{
SfxPopupWindow *pWin = NULL;
rtl::OUString aToolBarResStr;
- rtl::OUStringBuffer aTbxResName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/" )));
+ rtl::OUStringBuffer aTbxResName( "private:resource/toolbar/" );
switch( GetSlotId() )
{
case SID_OBJECT_ALIGN:
@@ -164,7 +164,7 @@ void SdTbxControl::StateChanged( sal_uInt16 nSId,
}
else
{
- rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
+ rtl::OUString aSlotURL( "slot:" );
aSlotURL += rtl::OUString::valueOf( sal_Int32( nImage ));
Image aImage = GetImage( m_xFrame,
aSlotURL,
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index b4f04cf4b2a3..0982c71b2df4 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -186,7 +186,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
if( xFrame.is() ) try
{
Reference< XPropertySet > xControllerSet( xFrame->getController(), UNO_QUERY_THROW );
- xControllerSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DrawViewMode" ) ) ) >>= eMode;
+ xControllerSet->getPropertyValue( "DrawViewMode" ) >>= eMode;
}
catch( Exception& e )
{
@@ -259,9 +259,9 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
if( mxFrame.is() )
{
if( bInsertPage )
- sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DuplicatePage" ) );
+ sSlotStr = ".uno:DuplicatePage";
else
- sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Undo" ) );
+ sSlotStr = ".uno:Undo";
aSlotImage = ::GetImage( mxFrame, sSlotStr, sal_False );
String sSlotTitle;
@@ -307,12 +307,12 @@ IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl )
if( eLayout != AUTOLAYOUT__END )
{
aArgs = Sequence< PropertyValue >(1);
- aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "WhatLayout" ) );
+ aArgs[0].Name = "WhatLayout";
aArgs[0].Value <<= (sal_Int32)eLayout;
}
else if( mbInsertPage )
{
- sCommandURL = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DuplicatePage" ) );
+ sCommandURL = ".uno:DuplicatePage";
}
mrController.dispatchCommand( sCommandURL, aArgs );
@@ -324,7 +324,7 @@ IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl )
OUString SlideLayoutController_getImplementationName()
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sd.SlideLayoutController" ));
+ return OUString( "com.sun.star.comp.sd.SlideLayoutController" );
}
// --------------------------------------------------------------------
@@ -332,7 +332,7 @@ OUString SlideLayoutController_getImplementationName()
Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( RuntimeException )
{
Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+ aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController";
return aSNS;
}
@@ -340,14 +340,14 @@ Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( Ru
Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
{
- return *new SlideLayoutController( rSMgr, OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AssignLayout" )), false );
+ return *new SlideLayoutController( rSMgr, ".uno:AssignLayout", false );
}
// --------------------------------------------------------------------
OUString InsertSlideController_getImplementationName()
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sd.InsertSlideController" ));
+ return OUString( "com.sun.star.comp.sd.InsertSlideController" );
}
// --------------------------------------------------------------------
@@ -355,7 +355,7 @@ OUString InsertSlideController_getImplementationName()
Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( RuntimeException )
{
Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+ aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController";
return aSNS;
}
@@ -363,7 +363,7 @@ Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( Ru
Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
{
- return *new SlideLayoutController( rSMgr, OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPage" )), true );
+ return *new SlideLayoutController( rSMgr, ".uno:InsertPage" , true );
}
//========================================================================