summaryrefslogtreecommitdiff
path: root/filter/source/msfilter
diff options
context:
space:
mode:
Diffstat (limited to 'filter/source/msfilter')
-rw-r--r--filter/source/msfilter/escherex.cxx2
-rw-r--r--filter/source/msfilter/mstoolbar.cxx8
-rw-r--r--filter/source/msfilter/svdfppt.cxx18
3 files changed, 14 insertions, 14 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 34fe8a508e7a..25a84438a26c 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3258,7 +3258,7 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi
{
try
{
- const OUString sCustomShapeGeometry( RTL_CONSTASCII_USTRINGPARAM ( "CustomShapeGeometry" ) );
+ const OUString sCustomShapeGeometry( "CustomShapeGeometry" );
uno::Any aGeoPropSet = aXPropSet->getPropertyValue( sCustomShapeGeometry );
uno::Sequence< beans::PropertyValue > aGeoPropSeq;
if ( aGeoPropSet >>= aGeoPropSeq )
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index 5a06d41358ab..bc659c4be509 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -123,8 +123,8 @@ uno::Any
CustomToolBarImportHelper::createCommandFromMacro( const rtl::OUString& sCmd )
{
//"vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=document"
- static rtl::OUString scheme( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:" ));
- static rtl::OUString part2( RTL_CONSTASCII_USTRINGPARAM( "?language=Basic&location=document" ));
+ static rtl::OUString scheme( "vnd.sun.star.script:" );
+ static rtl::OUString part2( "?language=Basic&location=document" );
// create script url
rtl::OUString scriptURL = scheme + sCmd + part2;
return uno::makeAny( scriptURL );
@@ -153,7 +153,7 @@ CustomToolBarImportHelper::createMenu( const rtl::OUString& rName, const uno::Re
try
{
uno::Reference< ui::XUIConfigurationManager > xCfgManager( getCfgManager() );
- rtl::OUString sMenuBar( RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/") );
+ rtl::OUString sMenuBar("private:resource/menubar/");
sMenuBar += rName;
uno::Reference< container::XIndexContainer > xPopup( xCfgManager->createSettings(), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xProps( xPopup, uno::UNO_QUERY_THROW );
@@ -349,7 +349,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect
else if ( rHeader.getTct() == 0x0a )
{
aProp.Name = rtl::OUString("CommandURL") ;
- rtl::OUString sMenuBar( RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/") );
+ rtl::OUString sMenuBar("private:resource/menubar/");
TBCMenuSpecific* pMenu = getMenuSpecific();
if ( pMenu )
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 44a0b5214264..d4b16e392df9 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7195,7 +7195,7 @@ void CreateTableRows( Reference< XTableRows > xTableRows, const std::set< sal_In
else
nHeight = nTableBottom - nLastPosition;
- static const rtl::OUString sWidth( RTL_CONSTASCII_USTRINGPARAM ( "Height" ) );
+ static const rtl::OUString sWidth( "Height" );
Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ), UNO_QUERY_THROW );
xPropSet->setPropertyValue( sWidth, Any( nHeight ) );
}
@@ -7220,7 +7220,7 @@ void CreateTableColumns( Reference< XTableColumns > xTableColumns, const std::se
else
nWidth = nTableRight - nLastPosition;
- static const rtl::OUString sWidth( RTL_CONSTASCII_USTRINGPARAM ( "Width" ) );
+ static const rtl::OUString sWidth( "Width" );
Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ), UNO_QUERY_THROW );
xPropSet->setPropertyValue( sWidth, Any( nWidth ) );
}
@@ -7255,16 +7255,16 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
const sal_Int32 nRightDist(((const SdrTextRightDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_RIGHTDIST)).GetValue());
const sal_Int32 nUpperDist(((const SdrTextUpperDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_UPPERDIST)).GetValue());
const sal_Int32 nLowerDist(((const SdrTextLowerDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_LOWERDIST)).GetValue());
- static const rtl::OUString sTopBorder( RTL_CONSTASCII_USTRINGPARAM( "TextUpperDistance" ) );
- static const rtl::OUString sBottomBorder( RTL_CONSTASCII_USTRINGPARAM( "TextLowerDistance" ) );
- static const rtl::OUString sLeftBorder( RTL_CONSTASCII_USTRINGPARAM( "TextLeftDistance" ) );
- static const rtl::OUString sRightBorder( RTL_CONSTASCII_USTRINGPARAM( "TextRightDistance" ) );
+ static const rtl::OUString sTopBorder( "TextUpperDistance" );
+ static const rtl::OUString sBottomBorder( "TextLowerDistance" );
+ static const rtl::OUString sLeftBorder( "TextLeftDistance" );
+ static const rtl::OUString sRightBorder( "TextRightDistance" );
xPropSet->setPropertyValue( sTopBorder, Any( nUpperDist ) );
xPropSet->setPropertyValue( sRightBorder, Any( nRightDist ) );
xPropSet->setPropertyValue( sLeftBorder, Any( nLeftDist ) );
xPropSet->setPropertyValue( sBottomBorder, Any( nLowerDist ) );
- static const rtl::OUString sTextVerticalAdjust( RTL_CONSTASCII_USTRINGPARAM( "TextVerticalAdjust" ) );
+ static const rtl::OUString sTextVerticalAdjust( "TextVerticalAdjust" );
const SdrTextVertAdjust eTextVertAdjust(((const SdrTextVertAdjustItem&)pObj->GetMergedItem(SDRATTR_TEXT_VERTADJUST)).GetValue());
drawing::TextVerticalAdjust eVA( drawing::TextVerticalAdjust_TOP );
if ( eTextVertAdjust == SDRTEXTVERTADJUST_CENTER )
@@ -7376,8 +7376,8 @@ void ApplyCellLineAttributes( const SdrObject* pLine, Reference< XTable >& xTabl
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 sDiagonalTLBR( "DiagonalTLBR" );
+ static const rtl::OUString sDiagonalBLTR( "DiagonalBLTR" );
sal_Int32 nPosition = *aIter & 0xffffff;
sal_Int32 nFlags = *aIter &~0xffffff;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 06:54:08 +0000