include/svx/sdasitm.hxx | 12 ------------
svx/source/items/customshapeitem.cxx | 8 --------
svx/source/svdraw/svdattr.cxx | 4 ++--
svx/source/svdraw/svdoashp.cxx | 6 +++---
4 files changed, 5 insertions(+), 25 deletions(-)
New commits:
commit 0a8d96b7b565e496a18e22b44d04be7aa2513c94
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jun 11 14:19:13 2015 +0200
SdrCustomShapeEngine/DataItem are just SfxStringItem
Change-Id: I94f8c268781f5a5b4da9da78af183adefc0c2925
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 346772e..a701f37 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -31,18 +31,6 @@
#include <map>
#include <unordered_map>
-class SdrCustomShapeEngineItem : public SfxStringItem
-{
- public :
- SdrCustomShapeEngineItem();
-};
-
-class SdrCustomShapeDataItem : public SfxStringItem
-{
- public :
- SdrCustomShapeDataItem();
-};
-
class SVX_DLLPUBLIC SdrCustomShapeGeometryItem : public SfxPoolItem
{
public:
diff --git a/svx/source/items/customshapeitem.cxx
b/svx/source/items/customshapeitem.cxx
index 4b51ac9..6c77b90 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -23,14 +23,6 @@
using namespace ::std;
using namespace com::sun::star;
-SdrCustomShapeEngineItem::SdrCustomShapeEngineItem()
-: SfxStringItem( SDRATTR_CUSTOMSHAPE_ENGINE, "" )
-{}
-
-SdrCustomShapeDataItem::SdrCustomShapeDataItem()
-: SfxStringItem( SDRATTR_CUSTOMSHAPE_DATA, "" )
-{}
-
TYPEINIT1_FACTORY( SdrCustomShapeGeometryItem, SfxPoolItem , new
SdrCustomShapeGeometryItem);
SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem()
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 408a694..18368c5 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -302,8 +302,8 @@ SdrItemPool::SdrItemPool(
mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_8 - SDRATTR_START ] =
new SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_8,
basegfx::B3DVector(0.0,0.0,1.0));
mppLocalPoolDefaults[ SDRATTR_3DSCENE_SHADOW_SLANT - SDRATTR_START ] = new
SfxUInt16Item(SDRATTR_3DSCENE_SHADOW_SLANT, 0);
mppLocalPoolDefaults[ SDRATTR_3DSCENE_SHADE_MODE - SDRATTR_START ] = new
Svx3DShadeModeItem;
- mppLocalPoolDefaults[ SDRATTR_CUSTOMSHAPE_ENGINE - SDRATTR_START ] = new
SdrCustomShapeEngineItem;
- mppLocalPoolDefaults[ SDRATTR_CUSTOMSHAPE_DATA - SDRATTR_START ] = new
SdrCustomShapeDataItem;
+ mppLocalPoolDefaults[ SDRATTR_CUSTOMSHAPE_ENGINE - SDRATTR_START ] = new
SfxStringItem(SDRATTR_CUSTOMSHAPE_ENGINE, "");
+ mppLocalPoolDefaults[ SDRATTR_CUSTOMSHAPE_DATA - SDRATTR_START ] = new
SfxStringItem(SDRATTR_CUSTOMSHAPE_DATA, "");
mppLocalPoolDefaults[ SDRATTR_CUSTOMSHAPE_GEOMETRY - SDRATTR_START ] = new
SdrCustomShapeGeometryItem;
mppLocalPoolDefaults[ SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL - SDRATTR_START
] = new SdrCustomShapeReplacementURLItem;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 190ba76..b78776b7 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -171,7 +171,7 @@ static MSO_SPT ImpGetCustomShapeType( const
SdrObjCustomShape& rCustoShape )
{
MSO_SPT eRetValue = mso_sptNil;
- OUString aEngine( static_cast<const SdrCustomShapeEngineItem&>(
rCustoShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE ) ).GetValue() );
+ OUString aEngine( static_cast<const SfxStringItem&>(
rCustoShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE ) ).GetValue() );
if ( aEngine.isEmpty() || aEngine ==
"com.sun.star.drawing.EnhancedCustomShapeEngine" )
{
OUString sShapeType;
@@ -412,7 +412,7 @@ Reference< XCustomShapeEngine >
SdrObjCustomShape::GetCustomShapeEngine() const
if (mxCustomShapeEngine.is())
return mxCustomShapeEngine;
- OUString aEngine(static_cast<const
SdrCustomShapeEngineItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE
)).GetValue());
+ OUString aEngine(static_cast<const SfxStringItem&>(GetMergedItem(
SDRATTR_CUSTOMSHAPE_ENGINE )).GetValue());
if ( aEngine.isEmpty() )
aEngine = "com.sun.star.drawing.EnhancedCustomShapeEngine";
@@ -3255,7 +3255,7 @@ void SdrObjCustomShape::impl_setUnoShape(const
uno::Reference<uno::XInterface>&
OUString SdrObjCustomShape::GetCustomShapeName()
{
OUString sShapeName;
- OUString aEngine( static_cast<const
SdrCustomShapeEngineItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE
)).GetValue() );
+ OUString aEngine( static_cast<const SfxStringItem&>(GetMergedItem(
SDRATTR_CUSTOMSHAPE_ENGINE )).GetValue() );
if ( aEngine.isEmpty()
|| aEngine == "com.sun.star.drawing.EnhancedCustomShapeEngine" )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
