summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-07-19 16:17:23 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-07-26 00:22:00 +0200
commit8e8b94734423df7c3e9d00a865e2620b927f3d93 (patch)
treef4a55a0cb476dfb0faf4c812f339201221e437ba
parentc8b5979309311a0878e9fe0041423ff0620052bf (diff)
remove unused property
Change-Id: Ia4b0c6985c9e52fed756edc08b959d3b60a122f0
-rw-r--r--include/sfx2/sidebar/Theme.hxx1
-rw-r--r--sfx2/source/sidebar/Theme.cxx5
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.cxx54
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.hxx1
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.cxx19
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.hxx1
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.cxx13
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.hxx1
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.cxx21
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.hxx1
-rw-r--r--svx/source/sidebar/shadow/ShadowPropertyPanel.cxx14
-rw-r--r--svx/source/sidebar/shadow/ShadowPropertyPanel.hxx1
12 files changed, 3 insertions, 129 deletions
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index e6ee996f7a28..bd23c6e1974f 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -125,7 +125,6 @@ public:
__Int_Bool,
- Bool_UseSymphonyIcons,
Bool_UseSystemColors,
Bool_UseToolBoxItemSeparator,
Bool_IsHighContrastModeActive,
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 50f0bb914e35..71d8bf28ad0c 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -138,9 +138,6 @@ void Theme::HandleDataChange()
void Theme::InitializeTheme()
{
setPropertyValue(
- maPropertyIdToNameMap[Bool_UseSymphonyIcons],
- Any(false));
- setPropertyValue(
maPropertyIdToNameMap[Bool_UseSystemColors],
Any(false));
}
@@ -734,7 +731,6 @@ void Theme::SetupPropertyMaps()
AddEntry(Int_TabBarBottomPadding);
AddEntry(Int_ButtonCornerRadius);
- AddEntry(Bool_UseSymphonyIcons);
AddEntry(Bool_UseSystemColors);
AddEntry(Bool_UseToolBoxItemSeparator);
AddEntry(Bool_IsHighContrastModeActive);
@@ -805,7 +801,6 @@ Theme::PropertyType Theme::GetPropertyType (const ThemeItem eItem)
case Int_ButtonCornerRadius:
return PT_Integer;
- case Bool_UseSymphonyIcons:
case Bool_UseSystemColors:
case Bool_UseToolBoxItemSeparator:
case Bool_IsHighContrastModeActive:
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 766ba52f0821..376dc4e59660 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -112,7 +112,6 @@ AreaPropertyPanel::AreaPropertyPanel(
Initialize();
}
-
AreaPropertyPanel::~AreaPropertyPanel()
{
disposeOnce();
@@ -198,8 +197,6 @@ void AreaPropertyPanel::Initialize()
mpLBTransType->SetAccessibleRelationLabeledBy(mpTrspTextFT);
mpMTRTransparent->SetAccessibleRelationLabeledBy(mpMTRTransparent);
mpBTNGradient->SetAccessibleRelationLabeledBy(mpBTNGradient);
-
- SetupIcons();
}
IMPL_LINK(AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox)
@@ -500,29 +497,11 @@ IMPL_LINK(AreaPropertyPanel, SelectFillAttrHdl, ListBox*, pToolBox)
return 0;
}
-
VclPtr<PopupControl> AreaPropertyPanel::CreateTransparencyGradientControl (PopupContainer* pParent)
{
return VclPtrInstance<AreaTransparencyGradientControl>(pParent, *this);
}
-
-
-
-void AreaPropertyPanel::SetupIcons()
-{
- if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons))
- {
- // todo
- }
- else
- {
- // todo
- }
-}
-
-
-
VclPtr<vcl::Window> AreaPropertyPanel::Create (
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
@@ -541,18 +520,11 @@ VclPtr<vcl::Window> AreaPropertyPanel::Create (
pBindings);
}
-
-
void AreaPropertyPanel::DataChanged(
- const DataChangedEvent& rEvent)
+ const DataChangedEvent& /*rEvent*/)
{
- (void)rEvent;
-
- SetupIcons();
}
-
-
void AreaPropertyPanel::ImpUpdateTransparencies()
{
if(mpTransparanceItem.get() && mpFloatTransparenceItem.get())
@@ -674,8 +646,6 @@ void AreaPropertyPanel::ImpUpdateTransparencies()
}
}
-
-
void AreaPropertyPanel::NotifyItemUpdate(
sal_uInt16 nSID,
SfxItemState eState,
@@ -973,11 +943,6 @@ void AreaPropertyPanel::NotifyItemUpdate(
}
}
-
-
-
-
-
void AreaPropertyPanel::Update()
{
if(mpStyleItem)
@@ -1096,8 +1061,6 @@ void AreaPropertyPanel::Update()
}
}
-
-
IMPL_LINK_TYPED( AreaPropertyPanel, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void )
{
maTrGrPopup.Rearrange(mpFloatTransparenceItem.get());
@@ -1105,8 +1068,6 @@ IMPL_LINK_TYPED( AreaPropertyPanel, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void
maTrGrPopup.Show(*pToolBox);
}
-
-
IMPL_LINK_NOARG(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl)
{
sal_Int32 nSelectType = mpLBTransType->GetSelectEntryPos();
@@ -1202,8 +1163,6 @@ IMPL_LINK_NOARG(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl)
return 0L;
}
-
-
IMPL_LINK_NOARG(AreaPropertyPanel, ModifyTransparentHdl_Impl)
{
const sal_uInt16 nTrans = (sal_uInt16)mpMTRTransparent->GetValue();
@@ -1221,11 +1180,6 @@ IMPL_LINK_NOARG(AreaPropertyPanel, ModifyTransparentHdl_Impl)
return 0L;
}
-
-
-
-
-
XGradient AreaPropertyPanel::GetGradient (const css::awt::GradientStyle eStyle) const
{
switch (eStyle)
@@ -1246,9 +1200,6 @@ XGradient AreaPropertyPanel::GetGradient (const css::awt::GradientStyle eStyle)
}
}
-
-
-
void AreaPropertyPanel::SetGradient (const XGradient& rGradient)
{
switch (rGradient.GetGradientStyle())
@@ -1276,9 +1227,6 @@ void AreaPropertyPanel::SetGradient (const XGradient& rGradient)
}
}
-
-
-
sal_Int32 AreaPropertyPanel::GetSelectedTransparencyTypeIndex() const
{
return mpLBTransType->GetSelectEntryPos();
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index a52250e818cd..04d8faf6aef2 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -156,7 +156,6 @@ private:
VclPtr<PopupControl> CreateTransparencyGradientControl (PopupContainer* pParent);
DECL_LINK_TYPED( ClickTrGrHdl_Impl, ToolBox*, void );
- static void SetupIcons();
void Initialize();
void Update();
void ImpUpdateTransparencies();
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 53806eaad936..37b6b6961391 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -228,20 +228,6 @@ IMPL_LINK_NOARG(GraphicPropertyPanel, GammaHdl)
-void GraphicPropertyPanel::SetupIcons()
-{
- if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons))
- {
- // todo
- }
- else
- {
- // todo
- }
-}
-
-
-
VclPtr<vcl::Window> GraphicPropertyPanel::Create (
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
@@ -263,11 +249,8 @@ VclPtr<vcl::Window> GraphicPropertyPanel::Create (
void GraphicPropertyPanel::DataChanged(
- const DataChangedEvent& rEvent)
+ const DataChangedEvent& /*rEvent*/)
{
- (void)rEvent;
-
- SetupIcons();
}
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
index f2b626055c0c..3f43d3c628d4 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
@@ -96,7 +96,6 @@ private:
DECL_LINK( BlueHdl, void*);
DECL_LINK( GammaHdl, void*);
- static void SetupIcons();
void Initialize();
};
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index e7348a9c19c0..faa5477518c3 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -287,18 +287,6 @@ void LinePropertyPanel::Initialize()
mpLBCapStyle->SetAccessibleName(OUString("Cap Style"));
}
-void LinePropertyPanel::SetupIcons()
-{
- if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons))
- {
- // todo
- }
- else
- {
- // todo
- }
-}
-
VclPtr<vcl::Window> LinePropertyPanel::Create (
vcl::Window* pParent,
const uno::Reference<frame::XFrame>& rxFrame,
@@ -316,7 +304,6 @@ VclPtr<vcl::Window> LinePropertyPanel::Create (
void LinePropertyPanel::DataChanged(const DataChangedEvent& /*rEvent*/)
{
- SetupIcons();
}
void LinePropertyPanel::NotifyItemUpdate(
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx
index ae6036c72fcb..6ef96e14e9af 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -145,7 +145,6 @@ private:
/// bitfield
bool mbWidthValuable : 1;
- static void SetupIcons();
void Initialize();
void FillLineEndList();
void FillLineStyleList();
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 498bffbd1a37..53d87883a06b 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -231,22 +231,6 @@ void PosSizePropertyPanel::Initialize()
mePoolUnit = maTransfWidthControl.GetCoreMetric();
}
-
-
-void PosSizePropertyPanel::SetupIcons()
-{
- if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons))
- {
- // todo
- }
- else
- {
- // todo
- }
-}
-
-
-
VclPtr<vcl::Window> PosSizePropertyPanel::Create (
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
@@ -270,11 +254,8 @@ VclPtr<vcl::Window> PosSizePropertyPanel::Create (
void PosSizePropertyPanel::DataChanged(
- const DataChangedEvent& rEvent)
+ const DataChangedEvent& /*rEvent*/)
{
- (void)rEvent;
-
- SetupIcons();
}
void PosSizePropertyPanel::HandleContextChange(
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 3c61c4b08aec..d315c6cf3469 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -158,7 +158,6 @@ private:
DECL_LINK( RotationHdl, void * );
DECL_LINK_TYPED( FlipHdl, ToolBox *, void );
- static void SetupIcons();
void Initialize();
void executePosX();
void executePosY();
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index 717ca1be34e4..a4bb8e122a36 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -133,7 +133,6 @@ void ShadowPropertyPanel::Initialize()
mpShadowTransSlider->SetRange(Range(0,100));
mpShadowTransSlider->SetUpdateMode(true);
mpShadowTransSlider->SetSlideHdl( LINK(this, ShadowPropertyPanel, ModifyShadowTransSliderHdl) );
- SetupIcons();
InsertDistanceValues();
InsertAngleValues();
}
@@ -248,21 +247,8 @@ void ShadowPropertyPanel::SetTransparencyValue(long nVal)
mpShadowTransMetric->SetValue(nVal);
}
-void ShadowPropertyPanel::SetupIcons()
-{
- if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons))
- {
- // todo
- }
- else
- {
- // todo
- }
-}
-
void ShadowPropertyPanel::DataChanged(const DataChangedEvent& /*rEvent*/)
{
- SetupIcons();
}
void ShadowPropertyPanel::InsertDistanceValues()
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
index 520e03daba48..510f2489ed53 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
@@ -77,7 +77,6 @@ private:
SfxBindings* mpBindings;
long nX,nY,nXY;
- static void SetupIcons();
void InsertDistanceValues();
void InsertAngleValues();
void SetTransparencyValue(long);