summaryrefslogtreecommitdiff
path: root/svx/source/toolbars
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/toolbars')
-rw-r--r--svx/source/toolbars/extrusionbar.cxx82
-rw-r--r--svx/source/toolbars/fontworkbar.cxx22
2 files changed, 52 insertions, 52 deletions
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index ad440da0b047..4fed654bd1b2 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -133,13 +133,13 @@ void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults, const
static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj )
{
- static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
- static const rtl::OUString sProjectionMode( RTL_CONSTASCII_USTRINGPARAM ( "ProjectionMode" ) );
- static const rtl::OUString sRotateAngle( RTL_CONSTASCII_USTRINGPARAM ( "RotateAngle" ) );
- static const rtl::OUString sViewPoint( RTL_CONSTASCII_USTRINGPARAM ( "ViewPoint" ) );
- static const rtl::OUString sOrigin( RTL_CONSTASCII_USTRINGPARAM ( "Origin" ) );
- static const rtl::OUString sSkew( RTL_CONSTASCII_USTRINGPARAM ( "Skew" ) );
- static const rtl::OUString sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) );
+ static const rtl::OUString sExtrusion( "Extrusion" );
+ static const rtl::OUString sProjectionMode( "ProjectionMode" );
+ static const rtl::OUString sRotateAngle( "RotateAngle" );
+ static const rtl::OUString sViewPoint( "ViewPoint" );
+ static const rtl::OUString sOrigin( "Origin" );
+ static const rtl::OUString sSkew( "Skew" );
+ static const rtl::OUString sDepth( "Depth" );
sal_uInt16 nSID = rReq.GetSlot();
switch( nSID )
@@ -316,7 +316,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
break;
case SID_EXTRUSION_3D_COLOR:
{
- static const rtl::OUString sExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) );
+ static const rtl::OUString sExtrusionColor( "Color" );
if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_3D_COLOR ) == SFX_ITEM_SET)
{
@@ -343,10 +343,10 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
break;
case SID_EXTRUSION_SURFACE:
{
- static const rtl::OUString sShadeMode( RTL_CONSTASCII_USTRINGPARAM ( "ShadeMode" ) );
- static const rtl::OUString sSpecularity( RTL_CONSTASCII_USTRINGPARAM ( "Specularity" ) );
- static const rtl::OUString sDiffusion( RTL_CONSTASCII_USTRINGPARAM ( "Diffusion" ) );
- static const rtl::OUString sMetal( RTL_CONSTASCII_USTRINGPARAM ( "Metal" ) );
+ static const rtl::OUString sShadeMode( "ShadeMode" );
+ static const rtl::OUString sSpecularity( "Specularity" );
+ static const rtl::OUString sDiffusion( "Diffusion" );
+ static const rtl::OUString sMetal( "Metal" );
if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_SURFACE ) == SFX_ITEM_SET)
{
@@ -395,12 +395,12 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
break;
case SID_EXTRUSION_LIGHTING_INTENSITY:
{
- static const rtl::OUString sBrightness( RTL_CONSTASCII_USTRINGPARAM ( "Brightness" ) );
- static const rtl::OUString sLightFace( RTL_CONSTASCII_USTRINGPARAM ( "LightFace" ) );
- static const rtl::OUString sFirstLightHarsh( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightHarsh" ) );
- static const rtl::OUString sSecondLightHarsh( RTL_CONSTASCII_USTRINGPARAM ( "SecondLightHarsh" ) );
- static const rtl::OUString sFirstLightLevel( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightLevel" ) );
- static const rtl::OUString sSecondLightLevel( RTL_CONSTASCII_USTRINGPARAM ( "SecondLightLevel" ) );
+ static const rtl::OUString sBrightness( "Brightness" );
+ static const rtl::OUString sLightFace( "LightFace" );
+ static const rtl::OUString sFirstLightHarsh( "FirstLightHarsh" );
+ static const rtl::OUString sSecondLightHarsh( "SecondLightHarsh" );
+ static const rtl::OUString sFirstLightLevel( "FirstLightLevel" );
+ static const rtl::OUString sSecondLightLevel( "SecondLightLevel" );
if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_LIGHTING_INTENSITY ) == SFX_ITEM_SET)
{
@@ -468,8 +468,8 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
if((nDirection >= 0) && (nDirection < 9))
{
- const rtl::OUString sFirstLightDirection( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightDirection" ) );
- const rtl::OUString sSecondLightDirection( RTL_CONSTASCII_USTRINGPARAM ( "SecondLightDirection" ) );
+ const rtl::OUString sFirstLightDirection( "FirstLightDirection" );
+ const rtl::OUString sSecondLightDirection( "SecondLightDirection" );
const Direction3D * pLighting1Defaults;
const Direction3D * pLighting2Defaults;
@@ -642,11 +642,11 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
- static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
- static const rtl::OUString sViewPoint( RTL_CONSTASCII_USTRINGPARAM ( "ViewPoint" ) );
- static const rtl::OUString sOrigin( RTL_CONSTASCII_USTRINGPARAM ( "Origin" ) );
- static const rtl::OUString sSkew( RTL_CONSTASCII_USTRINGPARAM ( "Skew" ) );
- static const rtl::OUString sProjectionMode( RTL_CONSTASCII_USTRINGPARAM ( "ProjectionMode" ) );
+ static const rtl::OUString sExtrusion( "Extrusion" );
+ static const rtl::OUString sViewPoint( "ViewPoint" );
+ static const rtl::OUString sOrigin( "Origin" );
+ static const rtl::OUString sSkew( "Skew" );
+ static const rtl::OUString sProjectionMode( "ProjectionMode" );
com::sun::star::uno::Any* pAny;
@@ -793,8 +793,8 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
- static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
- static const rtl::OUString sProjectionMode( RTL_CONSTASCII_USTRINGPARAM ( "ProjectionMode" ) );
+ static const rtl::OUString sExtrusion( "Extrusion" );
+ static const rtl::OUString sProjectionMode( "ProjectionMode" );
com::sun::star::uno::Any* pAny;
@@ -849,10 +849,10 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
- static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
- static const rtl::OUString sShadeMode( RTL_CONSTASCII_USTRINGPARAM ( "ShadeMode" ) );
- static const rtl::OUString sSpecularity( RTL_CONSTASCII_USTRINGPARAM ( "Specularity" ) );
- static const rtl::OUString sMetal( RTL_CONSTASCII_USTRINGPARAM ( "Metal" ) );
+ static const rtl::OUString sExtrusion( "Extrusion" );
+ static const rtl::OUString sShadeMode( "ShadeMode" );
+ static const rtl::OUString sSpecularity( "Specularity" );
+ static const rtl::OUString sMetal( "Metal" );
com::sun::star::uno::Any* pAny;
@@ -937,8 +937,8 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet )
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
- static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
- static const rtl::OUString sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) );
+ static const rtl::OUString sExtrusion( "Extrusion" );
+ static const rtl::OUString sDepth( "Depth" );
com::sun::star::uno::Any* pAny;
@@ -1017,9 +1017,9 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
- static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
- static const rtl::OUString sFirstLightDirection( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightDirection" ) );
- static const rtl::OUString sSecondLightDirection( RTL_CONSTASCII_USTRINGPARAM ( "SecondLightDirection" ) );
+ static const rtl::OUString sExtrusion( "Extrusion" );
+ static const rtl::OUString sFirstLightDirection( "FirstLightDirection" );
+ static const rtl::OUString sSecondLightDirection( "SecondLightDirection" );
const Direction3D * pLighting1Defaults;
const Direction3D * pLighting2Defaults;
@@ -1098,8 +1098,8 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet )
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
- static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
- static const rtl::OUString sBrightness( RTL_CONSTASCII_USTRINGPARAM ( "Brightness" ) );
+ static const rtl::OUString sExtrusion( "Extrusion" );
+ static const rtl::OUString sBrightness( "Brightness" );
com::sun::star::uno::Any* pAny;
@@ -1166,8 +1166,8 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet )
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
- static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
- static const rtl::OUString sExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) );
+ static const rtl::OUString sExtrusion( "Extrusion" );
+ static const rtl::OUString sExtrusionColor( "Color" );
com::sun::star::uno::Any* pAny;
@@ -1236,7 +1236,7 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet )
namespace svx {
bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded )
{
- static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
+ static const rtl::OUString sExtrusion( "Extrusion" );
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index ddb89d86d444..a324bb9ef184 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -142,7 +142,7 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet )
SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
if( pObj->ISA( SdrObjCustomShape ) )
{
- const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) );
+ const rtl::OUString sType( "Type" );
SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
Any* pAny = aGeometryItem.GetPropertyValueByName( sType );
if( pAny )
@@ -240,7 +240,7 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus )
if ( nCheckStatus & 2 )
return ( nCheckStatus & 1 ) != 0;
- static const rtl::OUString sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) );
+ static const rtl::OUString sTextPath( "TextPath" );
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
@@ -265,8 +265,8 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus )
static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj )
{
- static const rtl::OUString sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) );
- static const rtl::OUString sSameLetterHeights( RTL_CONSTASCII_USTRINGPARAM ( "SameLetterHeights" ) );
+ static const rtl::OUString sTextPath( "TextPath" );
+ static const rtl::OUString sSameLetterHeights( "SameLetterHeights" );
sal_uInt16 nSID = rReq.GetSlot();
switch( nSID )
@@ -341,19 +341,19 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const rtl::OUString rCustomShape )
{
- const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) );
+ const rtl::OUString sType( "Type" );
com::sun::star::beans::PropertyValue aPropVal;
aPropVal.Name = sType;
aPropVal.Value <<= rCustomShape;
rGeometryItem.SetPropertyValue( aPropVal );
- const rtl::OUString sAdjustmentValues( RTL_CONSTASCII_USTRINGPARAM ( "AdjustmentValues" ) );
- const rtl::OUString sCoordinateOrigin( RTL_CONSTASCII_USTRINGPARAM ( "CoordinateOrigin" ) );
- const rtl::OUString sCoordinateSize( RTL_CONSTASCII_USTRINGPARAM ( "CoordinateSize" ) );
- const rtl::OUString sEquations( RTL_CONSTASCII_USTRINGPARAM ( "Equations" ) );
- const rtl::OUString sHandles( RTL_CONSTASCII_USTRINGPARAM ( "Handles" ) );
- const rtl::OUString sPath( RTL_CONSTASCII_USTRINGPARAM ( "Path" ) );
+ const rtl::OUString sAdjustmentValues( "AdjustmentValues" );
+ const rtl::OUString sCoordinateOrigin( "CoordinateOrigin" );
+ const rtl::OUString sCoordinateSize( "CoordinateSize" );
+ const rtl::OUString sEquations( "Equations" );
+ const rtl::OUString sHandles( "Handles" );
+ const rtl::OUString sPath( "Path" );
rGeometryItem.ClearPropertyValue( sAdjustmentValues );
rGeometryItem.ClearPropertyValue( sCoordinateOrigin );
rGeometryItem.ClearPropertyValue( sCoordinateSize );
generated by cgit (git 2.34.1) at 2024-07-26 13:18:36 +0000