summaryrefslogtreecommitdiffstats
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/form/fmPropBrw.cxx9
-rw-r--r--svx/source/svdraw/svdoashp.cxx36
-rw-r--r--svx/source/toolbars/extrusionbar.cxx7
-rw-r--r--svx/source/toolbars/fontworkbar.cxx3
4 files changed, 19 insertions, 36 deletions
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index d7bcdbd754f9..8caf6c64d98a 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -495,14 +495,13 @@ namespace
{
static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext )
{
- const OUString sConfigName( "/org.openoffice.Office.Common/Forms/PropertyBrowser/" );
- const OUString sPropertyName( "DirectHelp" );
-
::utl::OConfigurationTreeRoot aConfiguration(
- ::utl::OConfigurationTreeRoot::createWithComponentContext( _rxContext, sConfigName ) );
+ ::utl::OConfigurationTreeRoot::createWithComponentContext(
+ _rxContext,
+ "/org.openoffice.Office.Common/Forms/PropertyBrowser/" ) );
bool bEnabled = false;
- OSL_VERIFY( aConfiguration.getNodeValue( sPropertyName ) >>= bEnabled );
+ OSL_VERIFY( aConfiguration.getNodeValue( "DirectHelp" ) >>= bEnabled );
return bEnabled;
}
}
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index c03e0e9ac62e..6f217513cf93 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -175,9 +175,8 @@ static MSO_SPT ImpGetCustomShapeType( const SdrObjCustomShape& rCustoShape )
if ( aEngine.isEmpty() || aEngine == "com.sun.star.drawing.EnhancedCustomShapeEngine" )
{
OUString sShapeType;
- const OUString sType( "Type" );
const SdrCustomShapeGeometryItem& rGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(rCustoShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )) );
- const Any* pAny = rGeometryItem.GetPropertyValueByName( sType );
+ const Any* pAny = rGeometryItem.GetPropertyValueByName( "Type" );
if ( pAny && ( *pAny >>= sShapeType ) )
eRetValue = EnhancedCustomShapeTypeNames::Get( sShapeType );
}
@@ -738,62 +737,55 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, css::beans:
// POSITION
{
- const OUString sPosition( "Position" );
css::drawing::EnhancedCustomShapeParameterPair aPosition;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.First, pData->nPositionX, true, true );
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.Second, pData->nPositionY, true, false );
- rPropValues[ n ].Name = sPosition;
+ rPropValues[ n ].Name = "Position";
rPropValues[ n++ ].Value <<= aPosition;
}
if ( nFlags & SvxMSDffHandleFlags::MIRRORED_X )
{
- const OUString sMirroredX( "MirroredX" );
bool bMirroredX = true;
- rPropValues[ n ].Name = sMirroredX;
+ rPropValues[ n ].Name = "MirroredX";
rPropValues[ n++ ].Value <<= bMirroredX;
}
if ( nFlags & SvxMSDffHandleFlags::MIRRORED_Y )
{
- const OUString sMirroredY( "MirroredY" );
bool bMirroredY = true;
- rPropValues[ n ].Name = sMirroredY;
+ rPropValues[ n ].Name = "MirroredY";
rPropValues[ n++ ].Value <<= bMirroredY;
}
if ( nFlags & SvxMSDffHandleFlags::SWITCHED )
{
- const OUString sSwitched( "Switched" );
bool bSwitched = true;
- rPropValues[ n ].Name = sSwitched;
+ rPropValues[ n ].Name = "Switched";
rPropValues[ n++ ].Value <<= bSwitched;
}
if ( nFlags & SvxMSDffHandleFlags::POLAR )
{
- const OUString sPolar( "Polar" );
css::drawing::EnhancedCustomShapeParameterPair aCenter;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.First, pData->nCenterX,
bool( nFlags & SvxMSDffHandleFlags::CENTER_X_IS_SPECIAL ), true );
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.Second, pData->nCenterY,
bool( nFlags & SvxMSDffHandleFlags::CENTER_Y_IS_SPECIAL ), false );
- rPropValues[ n ].Name = sPolar;
+ rPropValues[ n ].Name = "Polar";
rPropValues[ n++ ].Value <<= aCenter;
if ( nFlags & SvxMSDffHandleFlags::RADIUS_RANGE )
{
if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE )
{
- const OUString sRadiusRangeMinimum( "RadiusRangeMinimum" );
css::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMinimum, pData->nRangeXMin,
bool( nFlags & SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL ), true );
- rPropValues[ n ].Name = sRadiusRangeMinimum;
+ rPropValues[ n ].Name = "RadiusRangeMinimum";
rPropValues[ n++ ].Value <<= aRadiusRangeMinimum;
}
if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE )
{
- const OUString sRadiusRangeMaximum( "RadiusRangeMaximum" );
css::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMaximum, pData->nRangeXMax,
bool( nFlags & SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL ), false );
- rPropValues[ n ].Name = sRadiusRangeMaximum;
+ rPropValues[ n ].Name = "RadiusRangeMaximum";
rPropValues[ n++ ].Value <<= aRadiusRangeMaximum;
}
}
@@ -802,38 +794,34 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, css::beans:
{
if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE )
{
- const OUString sRangeXMinimum( "RangeXMinimum" );
css::drawing::EnhancedCustomShapeParameter aRangeXMinimum;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMinimum, pData->nRangeXMin,
bool( nFlags & SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL ), true );
- rPropValues[ n ].Name = sRangeXMinimum;
+ rPropValues[ n ].Name = "RangeXMinimum";
rPropValues[ n++ ].Value <<= aRangeXMinimum;
}
if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE )
{
- const OUString sRangeXMaximum( "RangeXMaximum" );
css::drawing::EnhancedCustomShapeParameter aRangeXMaximum;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMaximum, pData->nRangeXMax,
bool( nFlags & SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL ), false );
- rPropValues[ n ].Name = sRangeXMaximum;
+ rPropValues[ n ].Name = "RangeXMaximum";
rPropValues[ n++ ].Value <<= aRangeXMaximum;
}
if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE )
{
- const OUString sRangeYMinimum( "RangeYMinimum" );
css::drawing::EnhancedCustomShapeParameter aRangeYMinimum;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMinimum, pData->nRangeYMin,
bool( nFlags & SvxMSDffHandleFlags::RANGE_Y_MIN_IS_SPECIAL ), true );
- rPropValues[ n ].Name = sRangeYMinimum;
+ rPropValues[ n ].Name = "RangeYMinimum";
rPropValues[ n++ ].Value <<= aRangeYMinimum;
}
if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE )
{
- const OUString sRangeYMaximum( "RangeYMaximum" );
css::drawing::EnhancedCustomShapeParameter aRangeYMaximum;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMaximum, pData->nRangeYMax,
bool( nFlags & SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL ), false );
- rPropValues[ n ].Name = sRangeYMaximum;
+ rPropValues[ n ].Name = "RangeYMaximum";
rPropValues[ n++ ].Value <<= aRangeYMaximum;
}
}
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 1185081d0b18..b1fed1402738 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -449,20 +449,17 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
if((nDirection >= 0) && (nDirection < 9))
{
- const OUString sFirstLightDirection( "FirstLightDirection" );
- const OUString sSecondLightDirection( "SecondLightDirection" );
-
const Direction3D * pLighting1Defaults;
const Direction3D * pLighting2Defaults;
getLightingDirectionDefaults( &pLighting1Defaults, &pLighting2Defaults );
css::beans::PropertyValue aPropValue;
- aPropValue.Name = sFirstLightDirection;
+ aPropValue.Name = "FirstLightDirection";
aPropValue.Value <<= pLighting1Defaults[nDirection];
rGeometryItem.SetPropertyValue( sExtrusion, aPropValue );
- aPropValue.Name = sSecondLightDirection;
+ aPropValue.Name = "SecondLightDirection";
aPropValue.Value <<= pLighting2Defaults[nDirection];
rGeometryItem.SetPropertyValue( sExtrusion, aPropValue );
}
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index f981076e6806..25f2f8c054f1 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -141,9 +141,8 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet )
SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
if( dynamic_cast<const SdrObjCustomShape*>( pObj) != nullptr )
{
- const OUString sType( "Type" );
const SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )));
- const Any* pAny = aGeometryItem.GetPropertyValueByName( sType );
+ const Any* pAny = aGeometryItem.GetPropertyValueByName( "Type" );
if( pAny )
{
OUString aType;
generated by cgit (git 2.34.1) at 2024-07-07 16:17:54 +0000