chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 32 +--
include/svx/obj3d.hxx | 8
include/svx/scene3d.hxx | 18 +-
include/svx/svx3ditems.hxx | 93 ++++-------
sd/source/ui/func/fucon3d.cxx | 2
svx/source/customshapes/EnhancedCustomShape3d.cxx | 14 -
svx/source/dialog/dlgctl3d.cxx | 16 -
svx/source/engine3d/float3d.cxx | 68 ++++----
svx/source/engine3d/svx3ditems.cxx | 53 ------
svx/source/engine3d/view3d.cxx | 2
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 18 +-
svx/source/sdr/primitive3d/sdrattributecreator3d.cxx | 8
svx/source/svdraw/svdattr.cxx | 26 +--
13 files changed, 146 insertions(+), 212 deletions(-)
New commits:
commit 9f6018bb64ae1da3a476f6bfca02e06b093f9e16
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Sep 1 14:46:50 2014 +0200
Consistency around SfxBoolItem in svx/svx3ditems.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."
Change-Id: I3253b4cc5657a7d6b960ee892584109d373eed3d
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 5cc56d6..76294c5 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -350,42 +350,42 @@ IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage,
PreviewChangeHdl)
LightSourceInfo* pInfo = &m_pLightSourceInfoList[0];
pInfo->aLightSource.nDiffuseColor = ((const
Svx3DLightcolor1Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTCOLOR_1)).GetValue().GetColor();
- pInfo->aLightSource.bIsEnabled = ((const
Svx3DLightOnOff1Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue();
+ pInfo->aLightSource.bIsEnabled = ((const
SfxBoolItem&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue();
pInfo->aLightSource.aDirection = B3DVectorToDirection3D(((const
Svx3DLightDirection1Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_1)).GetValue());
pInfo = &m_pLightSourceInfoList[1];
pInfo->aLightSource.nDiffuseColor = ((const
Svx3DLightcolor2Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTCOLOR_2)).GetValue().GetColor();
- pInfo->aLightSource.bIsEnabled = ((const
Svx3DLightOnOff2Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue();
+ pInfo->aLightSource.bIsEnabled = ((const
SfxBoolItem&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue();
pInfo->aLightSource.aDirection = B3DVectorToDirection3D(((const
Svx3DLightDirection2Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_2)).GetValue());
pInfo = &m_pLightSourceInfoList[2];
pInfo->aLightSource.nDiffuseColor = ((const
Svx3DLightcolor3Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTCOLOR_3)).GetValue().GetColor();
- pInfo->aLightSource.bIsEnabled = ((const
Svx3DLightOnOff3Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue();
+ pInfo->aLightSource.bIsEnabled = ((const
SfxBoolItem&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue();
pInfo->aLightSource.aDirection = B3DVectorToDirection3D(((const
Svx3DLightDirection3Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_3)).GetValue());
pInfo = &m_pLightSourceInfoList[3];
pInfo->aLightSource.nDiffuseColor = ((const
Svx3DLightcolor4Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTCOLOR_4)).GetValue().GetColor();
- pInfo->aLightSource.bIsEnabled = ((const
Svx3DLightOnOff4Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue();
+ pInfo->aLightSource.bIsEnabled = ((const
SfxBoolItem&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue();
pInfo->aLightSource.aDirection = B3DVectorToDirection3D(((const
Svx3DLightDirection4Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_4)).GetValue());
pInfo = &m_pLightSourceInfoList[4];
pInfo->aLightSource.nDiffuseColor = ((const
Svx3DLightcolor5Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTCOLOR_5)).GetValue().GetColor();
- pInfo->aLightSource.bIsEnabled = ((const
Svx3DLightOnOff5Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue();
+ pInfo->aLightSource.bIsEnabled = ((const
SfxBoolItem&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue();
pInfo->aLightSource.aDirection = B3DVectorToDirection3D(((const
Svx3DLightDirection5Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_5)).GetValue());
pInfo = &m_pLightSourceInfoList[5];
pInfo->aLightSource.nDiffuseColor = ((const
Svx3DLightcolor6Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTCOLOR_6)).GetValue().GetColor();
- pInfo->aLightSource.bIsEnabled = ((const
Svx3DLightOnOff6Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue();
+ pInfo->aLightSource.bIsEnabled = ((const
SfxBoolItem&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue();
pInfo->aLightSource.aDirection = B3DVectorToDirection3D(((const
Svx3DLightDirection6Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_6)).GetValue());
pInfo = &m_pLightSourceInfoList[6];
pInfo->aLightSource.nDiffuseColor = ((const
Svx3DLightcolor7Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTCOLOR_7)).GetValue().GetColor();
- pInfo->aLightSource.bIsEnabled = ((const
Svx3DLightOnOff7Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue();
+ pInfo->aLightSource.bIsEnabled = ((const
SfxBoolItem&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue();
pInfo->aLightSource.aDirection = B3DVectorToDirection3D(((const
Svx3DLightDirection7Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_7)).GetValue());
pInfo = &m_pLightSourceInfoList[7];
pInfo->aLightSource.nDiffuseColor = ((const
Svx3DLightcolor8Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTCOLOR_8)).GetValue().GetColor();
- pInfo->aLightSource.bIsEnabled = ((const
Svx3DLightOnOff8Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue();
+ pInfo->aLightSource.bIsEnabled = ((const
SfxBoolItem&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue();
pInfo->aLightSource.aDirection = B3DVectorToDirection3D(((const
Svx3DLightDirection8Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_8)).GetValue());
applyLightSourcesToModel();
@@ -529,42 +529,42 @@ void ThreeD_SceneIllumination_TabPage::updatePreview()
aItemSet.Put(Svx3DAmbientcolorItem(m_pLB_AmbientLight->GetSelectEntryColor()));
aItemSet.Put(Svx3DLightcolor1Item(pInfo->aLightSource.nDiffuseColor));
- aItemSet.Put(Svx3DLightOnOff1Item(pInfo->aLightSource.bIsEnabled));
+ aItemSet.Put(makeSvx3DLightOnOff1Item(pInfo->aLightSource.bIsEnabled));
aItemSet.Put(Svx3DLightDirection1Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection)));
pInfo = &m_pLightSourceInfoList[1];
aItemSet.Put(Svx3DLightcolor2Item(pInfo->aLightSource.nDiffuseColor));
- aItemSet.Put(Svx3DLightOnOff2Item(pInfo->aLightSource.bIsEnabled));
+ aItemSet.Put(makeSvx3DLightOnOff2Item(pInfo->aLightSource.bIsEnabled));
aItemSet.Put(Svx3DLightDirection2Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection)));
pInfo = &m_pLightSourceInfoList[2];
aItemSet.Put(Svx3DLightcolor3Item(pInfo->aLightSource.nDiffuseColor));
- aItemSet.Put(Svx3DLightOnOff3Item(pInfo->aLightSource.bIsEnabled));
+ aItemSet.Put(makeSvx3DLightOnOff3Item(pInfo->aLightSource.bIsEnabled));
aItemSet.Put(Svx3DLightDirection3Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection)));
pInfo = &m_pLightSourceInfoList[3];
aItemSet.Put(Svx3DLightcolor4Item(pInfo->aLightSource.nDiffuseColor));
- aItemSet.Put(Svx3DLightOnOff4Item(pInfo->aLightSource.bIsEnabled));
+ aItemSet.Put(makeSvx3DLightOnOff4Item(pInfo->aLightSource.bIsEnabled));
aItemSet.Put(Svx3DLightDirection4Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection)));
pInfo = &m_pLightSourceInfoList[4];
aItemSet.Put(Svx3DLightcolor5Item(pInfo->aLightSource.nDiffuseColor));
- aItemSet.Put(Svx3DLightOnOff5Item(pInfo->aLightSource.bIsEnabled));
+ aItemSet.Put(makeSvx3DLightOnOff5Item(pInfo->aLightSource.bIsEnabled));
aItemSet.Put(Svx3DLightDirection5Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection)));
pInfo = &m_pLightSourceInfoList[5];
aItemSet.Put(Svx3DLightcolor6Item(pInfo->aLightSource.nDiffuseColor));
- aItemSet.Put(Svx3DLightOnOff6Item(pInfo->aLightSource.bIsEnabled));
+ aItemSet.Put(makeSvx3DLightOnOff6Item(pInfo->aLightSource.bIsEnabled));
aItemSet.Put(Svx3DLightDirection6Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection)));
pInfo = &m_pLightSourceInfoList[6];
aItemSet.Put(Svx3DLightcolor7Item(pInfo->aLightSource.nDiffuseColor));
- aItemSet.Put(Svx3DLightOnOff7Item(pInfo->aLightSource.bIsEnabled));
+ aItemSet.Put(makeSvx3DLightOnOff7Item(pInfo->aLightSource.bIsEnabled));
aItemSet.Put(Svx3DLightDirection7Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection)));
pInfo = &m_pLightSourceInfoList[7];
aItemSet.Put(Svx3DLightcolor8Item(pInfo->aLightSource.nDiffuseColor));
- aItemSet.Put(Svx3DLightOnOff8Item(pInfo->aLightSource.bIsEnabled));
+ aItemSet.Put(makeSvx3DLightOnOff8Item(pInfo->aLightSource.bIsEnabled));
aItemSet.Put(Svx3DLightDirection8Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection)));
// set lights and ambient light
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 9e4ed03..87b926f 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -251,7 +251,7 @@ public :
// DoubleSided: sal_True/FALSE
bool GetDoubleSided() const
- { return ((const
Svx3DDoubleSidedItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue();
}
+ { return ((const
SfxBoolItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue(); }
// NormalsKind: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else ==
sal_True/TRUE
sal_uInt16 GetNormalsKind() const
@@ -259,7 +259,7 @@ public :
// NormalsInvert: sal_True/FALSE
bool GetNormalsInvert() const
- { return ((const
Svx3DNormalsInvertItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue();
}
+ { return ((const
SfxBoolItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue(); }
// TextureProjX: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else
== sal_True/TRUE
sal_uInt16 GetTextureProjectionX() const
@@ -271,7 +271,7 @@ public :
// Shadow3D: sal_True/FALSE
bool GetShadow3D() const
- { return ((const
Svx3DShadow3DItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue();
}
+ { return ((const
SfxBoolItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue(); }
// MaterialColor: Color
Color GetMaterialColor() const
@@ -291,7 +291,7 @@ public :
// TextureFilter: sal_True/FALSE
bool GetTextureFilter() const
- { return ((const
Svx3DTextureFilterItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue();
}
+ { return ((const
SfxBoolItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue(); }
// #i28528#
// Added extra Item (Bool) for chart2 to be able to show reduced line
geometry
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index e7a7419..1288774 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -116,7 +116,7 @@ public:
// Two sided lighting:
bool GetTwoSidedLighting() const
- { return ((const
Svx3DTwoSidedLightingItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue();
}
+ { return ((const
SfxBoolItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue();
}
// Lightcolor:
Color GetLightColor1() const
@@ -142,21 +142,21 @@ public:
// Light on/off:
bool GetLightOnOff1() const
- { return ((const
Svx3DLightOnOff1Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue();
}
+ { return ((const
SfxBoolItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue(); }
bool GetLightOnOff2() const
- { return ((const
Svx3DLightOnOff2Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue();
}
+ { return ((const
SfxBoolItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue(); }
bool GetLightOnOff3() const
- { return ((const
Svx3DLightOnOff3Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue();
}
+ { return ((const
SfxBoolItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue(); }
bool GetLightOnOff4() const
- { return ((const
Svx3DLightOnOff4Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue();
}
+ { return ((const
SfxBoolItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue(); }
bool GetLightOnOff5() const
- { return ((const
Svx3DLightOnOff5Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue();
}
+ { return ((const
SfxBoolItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue(); }
bool GetLightOnOff6() const
- { return ((const
Svx3DLightOnOff6Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue();
}
+ { return ((const
SfxBoolItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue(); }
bool GetLightOnOff7() const
- { return ((const
Svx3DLightOnOff7Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue();
}
+ { return ((const
SfxBoolItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue(); }
bool GetLightOnOff8() const
- { return ((const
Svx3DLightOnOff8Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue();
}
+ { return ((const
SfxBoolItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue(); }
// Light direction:
basegfx::B3DVector GetLightDirection1() const
diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx
index 8878bc1..fe8d1c9 100644
--- a/include/svx/svx3ditems.hxx
+++ b/include/svx/svx3ditems.hxx
@@ -56,10 +56,9 @@ inline SfxUInt32Item makeSvx3DEndAngleItem(sal_uInt32 nVal) {
return SfxUInt32Item(SDRATTR_3DOBJ_END_ANGLE, nVal);
}
-class SVX_DLLPUBLIC Svx3DDoubleSidedItem : public SfxBoolItem {
-public:
- Svx3DDoubleSidedItem(bool bVal = false);
-};
+inline SfxBoolItem makeSvx3DDoubleSidedItem(bool bVal) {
+ return SfxBoolItem(SDRATTR_3DOBJ_DOUBLE_SIDED, bVal);
+}
// #i28528#
// Added extra Item (Bool) for chart2 to be able to show reduced line geometry
@@ -80,10 +79,9 @@ public:
SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const
SAL_OVERRIDE;
};
-class Svx3DNormalsInvertItem : public SfxBoolItem {
-public:
- SVX_DLLPUBLIC Svx3DNormalsInvertItem(bool bVal = false);
-};
+inline SfxBoolItem makeSvx3DNormalsInvertItem(bool bVal) {
+ return SfxBoolItem(SDRATTR_3DOBJ_NORMALS_INVERT, bVal);
+}
class SVX_DLLPUBLIC Svx3DTextureProjectionXItem : public SfxUInt16Item {
public:
@@ -105,10 +103,9 @@ public:
virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const SAL_OVERRIDE;
};
-class Svx3DShadow3DItem : public SfxBoolItem {
-public:
- SVX_DLLPUBLIC Svx3DShadow3DItem(bool bVal = false);
-};
+inline SfxBoolItem makeSvx3DShadow3DItem(bool bVal) {
+ return SfxBoolItem(SDRATTR_3DOBJ_SHADOW_3D, bVal);
+}
class Svx3DMaterialColorItem : public SvxColorItem {
public:
@@ -150,10 +147,9 @@ public:
SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const
SAL_OVERRIDE;
};
-class Svx3DTextureFilterItem : public SfxBoolItem {
-public:
- SVX_DLLPUBLIC Svx3DTextureFilterItem(bool bVal = false);
-};
+inline SfxBoolItem makeSvx3DTextureFilterItem(bool bVal) {
+ return SfxBoolItem(SDRATTR_3DOBJ_TEXTURE_FILTER, bVal);
+}
// Svx3D _3DSCENE_ Items
class SVX_DLLPUBLIC Svx3DPerspectiveItem : public SfxUInt16Item {
@@ -172,12 +168,11 @@ inline SfxUInt32Item makeSvx3DDistanceItem(sal_uInt32
nVal) {
inline SfxUInt32Item makeSvx3DFocalLengthItem(sal_uInt32 nVal) {
return SfxUInt32Item(SDRATTR_3DSCENE_FOCAL_LENGTH, nVal);
-};
+}
-class Svx3DTwoSidedLightingItem : public SfxBoolItem {
-public:
- SVX_DLLPUBLIC Svx3DTwoSidedLightingItem(bool bVal = false);
-};
+inline SfxBoolItem makeSvx3DTwoSidedLightingItem(bool bVal) {
+ return SfxBoolItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, bVal);
+}
class SVX_DLLPUBLIC Svx3DLightcolor1Item : public SvxColorItem {
public:
@@ -224,45 +219,37 @@ public:
Svx3DAmbientcolorItem(const Color& rCol = Color(0x00666666));
};
-class SVX_DLLPUBLIC Svx3DLightOnOff1Item : public SfxBoolItem {
-public:
- Svx3DLightOnOff1Item(bool bVal = true);
-};
+inline SfxBoolItem makeSvx3DLightOnOff1Item(bool bVal) {
+ return SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_1, bVal);
+}
-class SVX_DLLPUBLIC Svx3DLightOnOff2Item : public SfxBoolItem {
-public:
- Svx3DLightOnOff2Item(bool bVal = false);
-};
+inline SfxBoolItem makeSvx3DLightOnOff2Item(bool bVal) {
+ return SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_2, bVal);
+}
-class SVX_DLLPUBLIC Svx3DLightOnOff3Item : public SfxBoolItem {
-public:
- Svx3DLightOnOff3Item(bool bVal = false);
-};
+inline SfxBoolItem makeSvx3DLightOnOff3Item(bool bVal) {
+ return SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_3, bVal);
+}
-class SVX_DLLPUBLIC Svx3DLightOnOff4Item : public SfxBoolItem {
-public:
- Svx3DLightOnOff4Item(bool bVal = false);
-};
+inline SfxBoolItem makeSvx3DLightOnOff4Item(bool bVal) {
+ return SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_4, bVal);
+}
-class SVX_DLLPUBLIC Svx3DLightOnOff5Item : public SfxBoolItem {
-public:
- Svx3DLightOnOff5Item(bool bVal = false);
-};
+inline SfxBoolItem makeSvx3DLightOnOff5Item(bool bVal) {
+ return SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_5, bVal);
+}
-class SVX_DLLPUBLIC Svx3DLightOnOff6Item : public SfxBoolItem {
-public:
- Svx3DLightOnOff6Item(bool bVal = false);
-};
+inline SfxBoolItem makeSvx3DLightOnOff6Item(bool bVal) {
+ return SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_6, bVal);
+}
-class SVX_DLLPUBLIC Svx3DLightOnOff7Item : public SfxBoolItem {
-public:
- Svx3DLightOnOff7Item(bool bVal = false);
-};
+inline SfxBoolItem makeSvx3DLightOnOff7Item(bool bVal) {
+ return SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_7, bVal);
+}
-class SVX_DLLPUBLIC Svx3DLightOnOff8Item : public SfxBoolItem {
-public:
- Svx3DLightOnOff8Item(bool bVal = false);
-};
+inline SfxBoolItem makeSvx3DLightOnOff8Item(bool bVal) {
+ return SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_8, bVal);
+}
class SVX_DLLPUBLIC Svx3DLightDirection1Item : public SvxB3DVectorItem {
public:
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index 8a6ac35..a54e497 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -118,7 +118,7 @@ E3dCompoundObject*
FuConstruct3dObject::ImpCreateBasic3DShape()
/* this is an open object, therefore it has to be handled double-
sided by default */
- p3DObj->SetMergedItem(Svx3DDoubleSidedItem(true));
+ p3DObj->SetMergedItem(makeSvx3DDoubleSidedItem(true));
break;
}
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx
b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 779c9df..1068f55 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -344,7 +344,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const
SdrObject* pShape2d, con
{
aSet.Put( XLineStyleItem( XLINE_SOLID ) );
aSet.Put( XFillStyleItem ( drawing::FillStyle_NONE ) );
- aSet.Put( Svx3DDoubleSidedItem( true ) );
+ aSet.Put( makeSvx3DDoubleSidedItem( true ) );
}
else
{
@@ -363,8 +363,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const
SdrObject* pShape2d, con
// get visible
if(bUseTwoFillStyles || (bIsMirroredX && !bIsMirroredY) ||
(!bIsMirroredX && bIsMirroredY))
{
- aSet.Put( Svx3DDoubleSidedItem( true ) );
- pScene->GetProperties().SetObjectItem(
Svx3DTwoSidedLightingItem( true ) );
+ aSet.Put( makeSvx3DDoubleSidedItem( true ) );
+ pScene->GetProperties().SetObjectItem(
makeSvx3DTwoSidedLightingItem( true ) );
}
}
@@ -560,7 +560,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const
SdrObject* pShape2d, con
{
XLineColorItem& rLineColor =
(XLineColorItem&)p3DObj->GetMergedItem( XATTR_LINECOLOR );
p3DObj->SetMergedItem( XFillColorItem( "",
rLineColor.GetColorValue() ) );
- p3DObj->SetMergedItem( Svx3DDoubleSidedItem( true ) );
+ p3DObj->SetMergedItem( makeSvx3DDoubleSidedItem( true ) );
p3DObj->SetMergedItem( Svx3DCloseFrontItem( false ) );
p3DObj->SetMergedItem( Svx3DCloseBackItem( false ) );
}
@@ -684,7 +684,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const
SdrObject* pShape2d, con
sal_uInt8 nSpotLight1 = (sal_uInt8)( fLightIntensity * 255.0 );
basegfx::B3DVector aSpotLight1( aFirstLightDirection.DirectionX, -
( aFirstLightDirection.DirectionY ), -( aFirstLightDirection.DirectionZ ) );
aSpotLight1.normalize();
- pScene->GetProperties().SetObjectItem( Svx3DLightOnOff1Item( true
) );
+ pScene->GetProperties().SetObjectItem( makeSvx3DLightOnOff1Item(
true ) );
Color aAmbientSpot1Color( nSpotLight1, nSpotLight1, nSpotLight1 );
pScene->GetProperties().SetObjectItem( Svx3DLightcolor1Item(
aAmbientSpot1Color ) );
pScene->GetProperties().SetObjectItem( Svx3DLightDirection1Item(
aSpotLight1 ) );
@@ -692,14 +692,14 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const
SdrObject* pShape2d, con
sal_uInt8 nSpotLight2 = (sal_uInt8)( fLight2Intensity * 255.0 );
basegfx::B3DVector aSpotLight2( aSecondLightDirection.DirectionX,
-aSecondLightDirection.DirectionY, -aSecondLightDirection.DirectionZ );
aSpotLight2.normalize();
- pScene->GetProperties().SetObjectItem( Svx3DLightOnOff2Item( true
) );
+ pScene->GetProperties().SetObjectItem( makeSvx3DLightOnOff2Item(
true ) );
Color aAmbientSpot2Color( nSpotLight2, nSpotLight2, nSpotLight2 );
pScene->GetProperties().SetObjectItem( Svx3DLightcolor2Item(
aAmbientSpot2Color ) );
pScene->GetProperties().SetObjectItem( Svx3DLightDirection2Item(
aSpotLight2 ) );
sal_uInt8 nSpotLight3 = 70;
basegfx::B3DVector aSpotLight3( 0.0, 0.0, 1.0 );
- pScene->GetProperties().SetObjectItem( Svx3DLightOnOff3Item(
true ) );
+ pScene->GetProperties().SetObjectItem(
makeSvx3DLightOnOff3Item( true ) );
Color aAmbientSpot3Color( nSpotLight3, nSpotLight3,
nSpotLight3 );
pScene->GetProperties().SetObjectItem( Svx3DLightcolor3Item(
aAmbientSpot3Color ) );
pScene->GetProperties().SetObjectItem(
Svx3DLightDirection3Item( aSpotLight3 ) );
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index a7a2d31..af8d771 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -894,14 +894,14 @@ bool Svx3DLightControl::GetLightOnOff(sal_uInt32 nNum)
const
switch(nNum)
{
- case 0 : return ((const
Svx3DLightOnOff1Item&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue();
- case 1 : return ((const
Svx3DLightOnOff2Item&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue();
- case 2 : return ((const
Svx3DLightOnOff3Item&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue();
- case 3 : return ((const
Svx3DLightOnOff4Item&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue();
- case 4 : return ((const
Svx3DLightOnOff5Item&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue();
- case 5 : return ((const
Svx3DLightOnOff6Item&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue();
- case 6 : return ((const
Svx3DLightOnOff7Item&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue();
- case 7 : return ((const
Svx3DLightOnOff8Item&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue();
+ case 0 : return ((const
SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue();
+ case 1 : return ((const
SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue();
+ case 2 : return ((const
SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue();
+ case 3 : return ((const
SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue();
+ case 4 : return ((const
SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue();
+ case 5 : return ((const
SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue();
+ case 6 : return ((const
SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue();
+ case 7 : return ((const
SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue();
}
}
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index e37855f..f77ad60 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -709,7 +709,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DOUBLE_SIDED);
if( eState != SFX_ITEM_DONTCARE )
{
- bool bValue = ((const
Svx3DDoubleSidedItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue();
+ bool bValue = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue();
if( bValue != aBtnDoubleSided.IsChecked() )
{
aBtnDoubleSided.Check( bValue );
@@ -833,7 +833,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_INVERT);
if( eState != SFX_ITEM_DONTCARE )
{
- bool bValue = ((const
Svx3DNormalsInvertItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue();
+ bool bValue = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue();
if( bValue != aBtnNormalsInvert.IsChecked() )
{
aBtnNormalsInvert.Check( bValue );
@@ -855,7 +855,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING);
if( eState != SFX_ITEM_DONTCARE )
{
- bool bValue = ((const
Svx3DTwoSidedLightingItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue();
+ bool bValue = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue();
if( bValue != aBtnTwoSidedLighting.IsChecked() )
{
aBtnTwoSidedLighting.Check( bValue );
@@ -898,7 +898,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_SHADOW_3D);
if( eState != SFX_ITEM_DONTCARE )
{
- bool bValue = ((const
Svx3DShadow3DItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue();
+ bool bValue = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue();
if( bValue != aBtnShadow3d.IsChecked() )
{
aBtnShadow3d.Check( bValue );
@@ -1013,7 +1013,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_1);
if( eState != SFX_ITEM_DONTCARE )
{
- bool bOn = ((const
Svx3DLightOnOff1Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue();
+ bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight1 )) ||
( !bOn && GetUILightState( aBtnLight1 )) )
{
@@ -1062,7 +1062,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_2);
if( eState != SFX_ITEM_DONTCARE )
{
- bool bOn = ((const
Svx3DLightOnOff2Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue();
+ bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight2 )) ||
( !bOn && GetUILightState( aBtnLight2 )) )
{
@@ -1111,7 +1111,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_3);
if( eState != SFX_ITEM_DONTCARE )
{
- bool bOn = ((const
Svx3DLightOnOff3Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue();
+ bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight3)) ||
( !bOn && GetUILightState( aBtnLight3)) )
{
@@ -1160,7 +1160,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_4);
if( eState != SFX_ITEM_DONTCARE )
{
- bool bOn = ((const
Svx3DLightOnOff4Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue();
+ bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight4 )) ||
( !bOn && GetUILightState( aBtnLight4 )) )
{
@@ -1209,7 +1209,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_5);
if( eState != SFX_ITEM_DONTCARE )
{
- bool bOn = ((const
Svx3DLightOnOff5Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue();
+ bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight5 )) ||
( !bOn && GetUILightState( aBtnLight5 )) )
{
@@ -1258,7 +1258,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_6);
if( eState != SFX_ITEM_DONTCARE )
{
- bool bOn = ((const
Svx3DLightOnOff6Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue();
+ bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight6 )) ||
( !bOn && GetUILightState( aBtnLight6 )) )
{
@@ -1307,7 +1307,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_7);
if( eState != SFX_ITEM_DONTCARE )
{
- bool bOn = ((const
Svx3DLightOnOff7Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue();
+ bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight7 )) ||
( !bOn && GetUILightState( aBtnLight7 )) )
{
@@ -1356,7 +1356,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_8);
if( eState != SFX_ITEM_DONTCARE )
{
- bool bOn = ((const
Svx3DLightOnOff8Item&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue();
+ bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight8 )) ||
( !bOn && GetUILightState( aBtnLight8 )) )
{
@@ -1518,7 +1518,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_FILTER);
if( eState != SFX_ITEM_DONTCARE )
{
- bool bValue = ((const
Svx3DTextureFilterItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue();
+ bool bValue = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue();
if( bValue != aBtnTexFilter.IsChecked() )
{
aBtnTexFilter.Check( bValue );
@@ -1784,7 +1784,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
if( eState != TRISTATE_INDET )
{
bool bValue = TRISTATE_TRUE == eState;
- rAttrs.Put(Svx3DDoubleSidedItem(bValue));
+ rAttrs.Put(makeSvx3DDoubleSidedItem(bValue));
}
else
rAttrs.InvalidateItem(SDRATTR_3DOBJ_DOUBLE_SIDED);
@@ -1835,7 +1835,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
if( eState != TRISTATE_INDET )
{
bool bValue = TRISTATE_TRUE == eState;
- rAttrs.Put(Svx3DNormalsInvertItem(bValue));
+ rAttrs.Put(makeSvx3DNormalsInvertItem(bValue));
}
else
rAttrs.InvalidateItem(SDRATTR_3DOBJ_NORMALS_INVERT);
@@ -1845,7 +1845,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
if( eState != TRISTATE_INDET )
{
bool bValue = TRISTATE_TRUE == eState;
- rAttrs.Put(Svx3DTwoSidedLightingItem(bValue));
+ rAttrs.Put(makeSvx3DTwoSidedLightingItem(bValue));
}
else
rAttrs.InvalidateItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING);
@@ -1865,7 +1865,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
if( eState != TRISTATE_INDET )
{
bool bValue = TRISTATE_TRUE == eState;
- rAttrs.Put(Svx3DShadow3DItem(bValue));
+ rAttrs.Put(makeSvx3DShadow3DItem(bValue));
rAttrs.Put(makeSdrShadowItem(bValue));
}
else
@@ -1920,7 +1920,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
if( eState != TRISTATE_INDET )
{
bool bValue = GetUILightState( aBtnLight1 );
- rAttrs.Put(Svx3DLightOnOff1Item(bValue));
+ rAttrs.Put(makeSvx3DLightOnOff1Item(bValue));
// Light 1 (direction)
if( bValue )
@@ -1945,7 +1945,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
if( eState != TRISTATE_INDET )
{
bool bValue = GetUILightState( aBtnLight2 );
- rAttrs.Put(Svx3DLightOnOff2Item(bValue));
+ rAttrs.Put(makeSvx3DLightOnOff2Item(bValue));
// Light 2 (direction)
if( bValue )
@@ -1969,7 +1969,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
if( eState != TRISTATE_INDET )
{
bool bValue = GetUILightState( aBtnLight3 );
- rAttrs.Put(Svx3DLightOnOff3Item(bValue));
+ rAttrs.Put(makeSvx3DLightOnOff3Item(bValue));
// Light 3 (direction)
if( bValue )
@@ -1993,7 +1993,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
if( eState != TRISTATE_INDET )
{
bool bValue = GetUILightState( aBtnLight4 );
- rAttrs.Put(Svx3DLightOnOff4Item(bValue));
+ rAttrs.Put(makeSvx3DLightOnOff4Item(bValue));
// Light 4 (direction)
if( bValue )
@@ -2017,7 +2017,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
if( eState != TRISTATE_INDET )
{
bool bValue = GetUILightState( aBtnLight5 );
- rAttrs.Put(Svx3DLightOnOff5Item(bValue));
+ rAttrs.Put(makeSvx3DLightOnOff5Item(bValue));
// Light 5 (direction)
if( bValue )
@@ -2041,7 +2041,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
if( eState != TRISTATE_INDET )
{
bool bValue = GetUILightState( aBtnLight6 );
- rAttrs.Put(Svx3DLightOnOff6Item(bValue));
+ rAttrs.Put(makeSvx3DLightOnOff6Item(bValue));
// Light 6 (direction)
if( bValue )
@@ -2065,7 +2065,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
if( eState != TRISTATE_INDET )
{
bool bValue = GetUILightState( aBtnLight7 );
- rAttrs.Put(Svx3DLightOnOff7Item(bValue));
+ rAttrs.Put(makeSvx3DLightOnOff7Item(bValue));
// Light 7 (direction)
if( bValue )
@@ -2089,7 +2089,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
if( eState != TRISTATE_INDET )
{
bool bValue = GetUILightState( aBtnLight8 );
- rAttrs.Put(Svx3DLightOnOff8Item(bValue));
+ rAttrs.Put(makeSvx3DLightOnOff8Item(bValue));
// Light 8 (direction)
if( bValue )
@@ -2169,7 +2169,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
if( eState != TRISTATE_INDET )
{
bool bValue = TRISTATE_TRUE == eState;
- rAttrs.Put(Svx3DTextureFilterItem(bValue));
+ rAttrs.Put(makeSvx3DTextureFilterItem(bValue));
}
else
rAttrs.InvalidateItem(SDRATTR_3DOBJ_TEXTURE_FILTER);
@@ -2943,15 +2943,15 @@ void Svx3DWin::ClickLight(PushButton& rBtn)
switch(nLightSource)
{
- case 0: aLightItemSet.Put(Svx3DLightcolor1Item(aColor));
aLightItemSet.Put(Svx3DLightOnOff1Item(bOnOff)); break;
- case 1: aLightItemSet.Put(Svx3DLightcolor2Item(aColor));
aLightItemSet.Put(Svx3DLightOnOff2Item(bOnOff)); break;
- case 2: aLightItemSet.Put(Svx3DLightcolor3Item(aColor));
aLightItemSet.Put(Svx3DLightOnOff3Item(bOnOff)); break;
- case 3: aLightItemSet.Put(Svx3DLightcolor4Item(aColor));
aLightItemSet.Put(Svx3DLightOnOff4Item(bOnOff)); break;
- case 4: aLightItemSet.Put(Svx3DLightcolor5Item(aColor));
aLightItemSet.Put(Svx3DLightOnOff5Item(bOnOff)); break;
- case 5: aLightItemSet.Put(Svx3DLightcolor6Item(aColor));
aLightItemSet.Put(Svx3DLightOnOff6Item(bOnOff)); break;
- case 6: aLightItemSet.Put(Svx3DLightcolor7Item(aColor));
aLightItemSet.Put(Svx3DLightOnOff7Item(bOnOff)); break;
+ case 0: aLightItemSet.Put(Svx3DLightcolor1Item(aColor));
aLightItemSet.Put(makeSvx3DLightOnOff1Item(bOnOff)); break;
+ case 1: aLightItemSet.Put(Svx3DLightcolor2Item(aColor));
aLightItemSet.Put(makeSvx3DLightOnOff2Item(bOnOff)); break;
+ case 2: aLightItemSet.Put(Svx3DLightcolor3Item(aColor));
aLightItemSet.Put(makeSvx3DLightOnOff3Item(bOnOff)); break;
+ case 3: aLightItemSet.Put(Svx3DLightcolor4Item(aColor));
aLightItemSet.Put(makeSvx3DLightOnOff4Item(bOnOff)); break;
+ case 4: aLightItemSet.Put(Svx3DLightcolor5Item(aColor));
aLightItemSet.Put(makeSvx3DLightOnOff5Item(bOnOff)); break;
+ case 5: aLightItemSet.Put(Svx3DLightcolor6Item(aColor));
aLightItemSet.Put(makeSvx3DLightOnOff6Item(bOnOff)); break;
+ case 6: aLightItemSet.Put(Svx3DLightcolor7Item(aColor));
aLightItemSet.Put(makeSvx3DLightOnOff7Item(bOnOff)); break;
default:
- case 7: aLightItemSet.Put(Svx3DLightcolor8Item(aColor));
aLightItemSet.Put(Svx3DLightOnOff8Item(bOnOff)); break;
+ case 7: aLightItemSet.Put(Svx3DLightcolor8Item(aColor));
aLightItemSet.Put(makeSvx3DLightOnOff8Item(bOnOff)); break;
}
aCtlLightPreview.GetSvx3DLightControl().Set3DAttributes(aLightItemSet);
diff --git a/svx/source/engine3d/svx3ditems.cxx
b/svx/source/engine3d/svx3ditems.cxx
index ee743cf..6527673 100644
--- a/svx/source/engine3d/svx3ditems.cxx
+++ b/svx/source/engine3d/svx3ditems.cxx
@@ -40,11 +40,6 @@ Svx3DBackscaleItem::Svx3DBackscaleItem(sal_uInt16 nVal)
: SfxUInt16Item(SDRATTR_3DOBJ_BACKSCALE, nVal)
{}
-Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(bool bVal)
-: SfxBoolItem(SDRATTR_3DOBJ_DOUBLE_SIDED, bVal)
-{}
-
-
// #i28528#
// Added extra Item (Bool) for chart2 to be able to show reduced line geometry
@@ -76,10 +71,6 @@ Svx3DNormalsKindItem::Svx3DNormalsKindItem(sal_uInt16 nVal)
: SfxUInt16Item(SDRATTR_3DOBJ_NORMALS_KIND, nVal)
{}
-Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(bool bVal)
-: SfxBoolItem(SDRATTR_3DOBJ_NORMALS_INVERT, bVal)
-{}
-
Svx3DTextureProjectionXItem::Svx3DTextureProjectionXItem(sal_uInt16 nVal)
: SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_X, nVal)
{}
@@ -88,10 +79,6 @@
Svx3DTextureProjectionYItem::Svx3DTextureProjectionYItem(sal_uInt16 nVal)
: SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_Y, nVal)
{}
-Svx3DShadow3DItem::Svx3DShadow3DItem(bool bVal)
-: SfxBoolItem(SDRATTR_3DOBJ_SHADOW_3D, bVal)
-{}
-
Svx3DMaterialColorItem::Svx3DMaterialColorItem(const Color& rCol)
: SvxColorItem(rCol, SDRATTR_3DOBJ_MAT_COLOR)
{}
@@ -116,18 +103,10 @@ Svx3DTextureModeItem::Svx3DTextureModeItem(sal_uInt16
nVal)
: SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_MODE, nVal)
{}
-Svx3DTextureFilterItem::Svx3DTextureFilterItem(bool bVal)
-: SfxBoolItem(SDRATTR_3DOBJ_TEXTURE_FILTER, bVal)
-{}
-
Svx3DPerspectiveItem::Svx3DPerspectiveItem(sal_uInt16 nVal)
: SfxUInt16Item(SDRATTR_3DSCENE_PERSPECTIVE, nVal)
{}
-Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(bool bVal)
-: SfxBoolItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, bVal)
-{}
-
Svx3DLightcolor1Item::Svx3DLightcolor1Item(const Color& rCol)
: SvxColorItem(rCol, SDRATTR_3DSCENE_LIGHTCOLOR_1)
{}
@@ -164,38 +143,6 @@ Svx3DAmbientcolorItem::Svx3DAmbientcolorItem(const Color&
rCol)
: SvxColorItem(rCol, SDRATTR_3DSCENE_AMBIENTCOLOR)
{}
-Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(bool bVal)
-: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_1, bVal)
-{}
-
-Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(bool bVal)
-: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_2, bVal)
-{}
-
-Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(bool bVal)
-: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_3, bVal)
-{}
-
-Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(bool bVal)
-: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_4, bVal)
-{}
-
-Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(bool bVal)
-: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_5, bVal)
-{}
-
-Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(bool bVal)
-: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_6, bVal)
-{}
-
-Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(bool bVal)
-: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_7, bVal)
-{}
-
-Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(bool bVal)
-: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_8, bVal)
-{}
-
Svx3DLightDirection1Item::Svx3DLightDirection1Item(const basegfx::B3DVector&
rVec)
: SvxB3DVectorItem(SDRATTR_3DSCENE_LIGHTDIRECTION_1, rVec)
{}
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 2c43355..41779f3 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -729,7 +729,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene,
SdrObject* pObj, boo
aDefault.SetDefaultExtrudeCloseFront(false);
aDefault.SetDefaultExtrudeCloseBack(false);
- aSet.Put(Svx3DDoubleSidedItem(true));
+ aSet.Put(makeSvx3DDoubleSidedItem(true));
// Set fill attribute
aSet.Put(XFillStyleItem(drawing::FillStyle_SOLID));
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index bcb6495..7122a9a 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -911,7 +911,7 @@ namespace drawinglayer
}
// get two sided lighting
- const bool bTwoSidedLighting(((const
Svx3DTwoSidedLightingItem&)rSet.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue());
+ const bool bTwoSidedLighting(((const
SfxBoolItem&)rSet.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue());
return attribute::SdrSceneAttribute(fDistance, fShadowSlant,
aProjectionMode, aShadeMode, bTwoSidedLighting);
}
@@ -921,56 +921,56 @@ namespace drawinglayer
// extract lights from given SfxItemSet (from scene)
::std::vector< attribute::Sdr3DLightAttribute > aLightVector;
- if(((const
Svx3DLightOnOff1Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue())
+ if(((const
SfxBoolItem&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue())
{
const basegfx::BColor aColor(((const
Svx3DLightcolor1Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_1)).GetValue().getBColor());
const basegfx::B3DVector aDirection(((const
Svx3DLightDirection1Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_1)).GetValue());
aLightVector.push_back(attribute::Sdr3DLightAttribute(aColor,
aDirection, true));
}
- if(((const
Svx3DLightOnOff2Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue())
+ if(((const
SfxBoolItem&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue())
{
const basegfx::BColor aColor(((const
Svx3DLightcolor2Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_2)).GetValue().getBColor());
const basegfx::B3DVector aDirection(((const
Svx3DLightDirection2Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_2)).GetValue());
aLightVector.push_back(attribute::Sdr3DLightAttribute(aColor,
aDirection, false));
}
- if(((const
Svx3DLightOnOff3Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue())
+ if(((const
SfxBoolItem&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue())
{
const basegfx::BColor aColor(((const
Svx3DLightcolor3Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_3)).GetValue().getBColor());
const basegfx::B3DVector aDirection(((const
Svx3DLightDirection3Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_3)).GetValue());
aLightVector.push_back(attribute::Sdr3DLightAttribute(aColor,
aDirection, false));
}
- if(((const
Svx3DLightOnOff4Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue())
+ if(((const
SfxBoolItem&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue())
{
const basegfx::BColor aColor(((const
Svx3DLightcolor4Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_4)).GetValue().getBColor());
const basegfx::B3DVector aDirection(((const
Svx3DLightDirection4Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_4)).GetValue());
aLightVector.push_back(attribute::Sdr3DLightAttribute(aColor,
aDirection, false));
}
- if(((const
Svx3DLightOnOff5Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue())
+ if(((const
SfxBoolItem&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue())
{
const basegfx::BColor aColor(((const
Svx3DLightcolor5Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_5)).GetValue().getBColor());
const basegfx::B3DVector aDirection(((const
Svx3DLightDirection5Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_5)).GetValue());
aLightVector.push_back(attribute::Sdr3DLightAttribute(aColor,
aDirection, false));
}
- if(((const
Svx3DLightOnOff6Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue())
+ if(((const
SfxBoolItem&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue())
{
const basegfx::BColor aColor(((const
Svx3DLightcolor6Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_6)).GetValue().getBColor());
const basegfx::B3DVector aDirection(((const
Svx3DLightDirection6Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_6)).GetValue());
aLightVector.push_back(attribute::Sdr3DLightAttribute(aColor,
aDirection, false));
}
- if(((const
Svx3DLightOnOff7Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue())
+ if(((const
SfxBoolItem&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue())
{
const basegfx::BColor aColor(((const
Svx3DLightcolor7Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_7)).GetValue().getBColor());
const basegfx::B3DVector aDirection(((const
Svx3DLightDirection7Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_7)).GetValue());
aLightVector.push_back(attribute::Sdr3DLightAttribute(aColor,
aDirection, false));
}
- if(((const
Svx3DLightOnOff8Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue())
+ if(((const
SfxBoolItem&)rSet.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue())
{
const basegfx::BColor aColor(((const
Svx3DLightcolor8Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_8)).GetValue().getBColor());
const basegfx::B3DVector aDirection(((const
Svx3DLightDirection8Item&)rSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_8)).GetValue());
diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
index 7c996ec..07d70fa 100644
--- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
+++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
@@ -50,7 +50,7 @@ namespace drawinglayer
}
// get NoermalsInvert flag
- const bool bInvertNormals(((const
Svx3DNormalsInvertItem&)rSet.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue());
+ const bool bInvertNormals(((const
SfxBoolItem&)rSet.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue());
// get TextureProjectionX
::com::sun::star::drawing::TextureProjectionMode
aTextureProjectionX(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC);
@@ -79,13 +79,13 @@ namespace drawinglayer
}
// get DoubleSided flag
- const bool bDoubleSided(((const
Svx3DDoubleSidedItem&)rSet.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue());
+ const bool bDoubleSided(((const
SfxBoolItem&)rSet.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue());
// get Shadow3D flag
- const bool bShadow3D(((const
Svx3DShadow3DItem&)rSet.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue());
+ const bool bShadow3D(((const
SfxBoolItem&)rSet.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue());
// get TextureFilter flag
- const bool bTextureFilter(((const
Svx3DTextureFilterItem&)rSet.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue());
+ const bool bTextureFilter(((const
SfxBoolItem&)rSet.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue());
// get texture kind
// TextureKind: 1 == Base3DTextureLuminance, 2 ==
Base3DTextureIntensity, 3 == Base3DTextureColor
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 228398c..c57392d 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -253,19 +253,19 @@ SdrItemPool::SdrItemPool(
mppLocalPoolDefaults[ SDRATTR_3DOBJ_HORZ_SEGS - SDRATTR_START ] = new
SfxUInt32Item(SDRATTR_3DOBJ_HORZ_SEGS, 24);
mppLocalPoolDefaults[ SDRATTR_3DOBJ_VERT_SEGS - SDRATTR_START ] = new
SfxUInt32Item(SDRATTR_3DOBJ_VERT_SEGS, 24);
mppLocalPoolDefaults[ SDRATTR_3DOBJ_END_ANGLE - SDRATTR_START ] = new
SfxUInt32Item(SDRATTR_3DOBJ_END_ANGLE, 3600);
- mppLocalPoolDefaults[ SDRATTR_3DOBJ_DOUBLE_SIDED - SDRATTR_START ] = new
Svx3DDoubleSidedItem;
+ mppLocalPoolDefaults[ SDRATTR_3DOBJ_DOUBLE_SIDED - SDRATTR_START ] = new
SfxBoolItem(SDRATTR_3DOBJ_DOUBLE_SIDED, false);
mppLocalPoolDefaults[ SDRATTR_3DOBJ_NORMALS_KIND - SDRATTR_START ] = new
Svx3DNormalsKindItem;
- mppLocalPoolDefaults[ SDRATTR_3DOBJ_NORMALS_INVERT - SDRATTR_START ] = new
Svx3DNormalsInvertItem;
+ mppLocalPoolDefaults[ SDRATTR_3DOBJ_NORMALS_INVERT - SDRATTR_START ] = new
SfxBoolItem(SDRATTR_3DOBJ_NORMALS_INVERT, false);
mppLocalPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_PROJ_X - SDRATTR_START ] = new
Svx3DTextureProjectionXItem;
mppLocalPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_PROJ_Y - SDRATTR_START ] = new
Svx3DTextureProjectionYItem;
- mppLocalPoolDefaults[ SDRATTR_3DOBJ_SHADOW_3D - SDRATTR_START ] = new
Svx3DShadow3DItem;
+ mppLocalPoolDefaults[ SDRATTR_3DOBJ_SHADOW_3D - SDRATTR_START ] = new
SfxBoolItem(SDRATTR_3DOBJ_SHADOW_3D, false);
mppLocalPoolDefaults[ SDRATTR_3DOBJ_MAT_COLOR - SDRATTR_START ] = new
Svx3DMaterialColorItem;
mppLocalPoolDefaults[ SDRATTR_3DOBJ_MAT_EMISSION - SDRATTR_START ] = new
Svx3DMaterialEmissionItem;
mppLocalPoolDefaults[ SDRATTR_3DOBJ_MAT_SPECULAR - SDRATTR_START ] = new
Svx3DMaterialSpecularItem;
mppLocalPoolDefaults[ SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY - SDRATTR_START
] = new Svx3DMaterialSpecularIntensityItem;
mppLocalPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_KIND - SDRATTR_START ] = new
Svx3DTextureKindItem;
mppLocalPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_MODE - SDRATTR_START ] = new
Svx3DTextureModeItem;
- mppLocalPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_FILTER - SDRATTR_START ] = new
Svx3DTextureFilterItem;
+ mppLocalPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_FILTER - SDRATTR_START ] = new
SfxBoolItem(SDRATTR_3DOBJ_TEXTURE_FILTER, false);
mppLocalPoolDefaults[ SDRATTR_3DOBJ_SMOOTH_NORMALS - SDRATTR_START ] = new
Svx3DSmoothNormalsItem;
mppLocalPoolDefaults[ SDRATTR_3DOBJ_SMOOTH_LIDS - SDRATTR_START ] = new
Svx3DSmoothLidsItem;
mppLocalPoolDefaults[ SDRATTR_3DOBJ_CHARACTER_MODE - SDRATTR_START ] = new
Svx3DCharacterModeItem;
@@ -275,7 +275,7 @@ SdrItemPool::SdrItemPool(
mppLocalPoolDefaults[ SDRATTR_3DSCENE_PERSPECTIVE - SDRATTR_START ] = new
Svx3DPerspectiveItem;
mppLocalPoolDefaults[ SDRATTR_3DSCENE_DISTANCE - SDRATTR_START ] = new
SfxUInt32Item(SDRATTR_3DSCENE_DISTANCE, 100);
mppLocalPoolDefaults[ SDRATTR_3DSCENE_FOCAL_LENGTH - SDRATTR_START ] = new
SfxUInt32Item(SDRATTR_3DSCENE_FOCAL_LENGTH, 100);
- mppLocalPoolDefaults[ SDRATTR_3DSCENE_TWO_SIDED_LIGHTING - SDRATTR_START ]
= new Svx3DTwoSidedLightingItem;
+ mppLocalPoolDefaults[ SDRATTR_3DSCENE_TWO_SIDED_LIGHTING - SDRATTR_START ]
= new SfxBoolItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, false);
mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_1 - SDRATTR_START ] = new
Svx3DLightcolor1Item;
mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_2 - SDRATTR_START ] = new
Svx3DLightcolor2Item;
mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_3 - SDRATTR_START ] = new
Svx3DLightcolor3Item;
@@ -285,14 +285,14 @@ SdrItemPool::SdrItemPool(
mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_7 - SDRATTR_START ] = new
Svx3DLightcolor7Item;
mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTCOLOR_8 - SDRATTR_START ] = new
Svx3DLightcolor8Item;
mppLocalPoolDefaults[ SDRATTR_3DSCENE_AMBIENTCOLOR - SDRATTR_START ] = new
Svx3DAmbientcolorItem;
- mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_1 - SDRATTR_START ] = new
Svx3DLightOnOff1Item;
- mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_2 - SDRATTR_START ] = new
Svx3DLightOnOff2Item;
- mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_3 - SDRATTR_START ] = new
Svx3DLightOnOff3Item;
- mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_4 - SDRATTR_START ] = new
Svx3DLightOnOff4Item;
- mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_5 - SDRATTR_START ] = new
Svx3DLightOnOff5Item;
- mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_6 - SDRATTR_START ] = new
Svx3DLightOnOff6Item;
- mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_7 - SDRATTR_START ] = new
Svx3DLightOnOff7Item;
- mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_8 - SDRATTR_START ] = new
Svx3DLightOnOff8Item;
+ mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_1 - SDRATTR_START ] = new
SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_1, true);
+ mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_2 - SDRATTR_START ] = new
SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_2, false);
+ mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_3 - SDRATTR_START ] = new
SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_3, false);
+ mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_4 - SDRATTR_START ] = new
SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_4, false);
+ mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_5 - SDRATTR_START ] = new
SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_5, false);
+ mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_6 - SDRATTR_START ] = new
SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_6, false);
+ mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_7 - SDRATTR_START ] = new
SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_7, false);
+ mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTON_8 - SDRATTR_START ] = new
SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_8, false);
mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_1 - SDRATTR_START ] =
new Svx3DLightDirection1Item;
mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_2 - SDRATTR_START ] =
new Svx3DLightDirection2Item;
mppLocalPoolDefaults[ SDRATTR_3DSCENE_LIGHTDIRECTION_3 - SDRATTR_START ] =
new Svx3DLightDirection3Item;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
