summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2014-11-26 20:22:27 +0200
committerMaxim Monastirsky <momonasmon@gmail.com>2014-11-26 22:50:24 +0200
commit3e1dc286891e7542f66ddc4ac407556a5aedc9e3 (patch)
treef094c3d00fab068707a07efc57c9f08a14eb4eb9 /svx
parent8e5ac3ba8b8fe445bf6918c15172756337033dca (diff)
Cleanup some leftovers from the line spacing popup conversion
Change-Id: Ia2e35461958ea5d79241fa2231bd7ef164fc378d
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.cxx20
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.hxx5
2 files changed, 0 insertions, 25 deletions
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 2867a5ce43fc..d7828c4795a0 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -197,7 +197,6 @@ void ParaPropertyPanel::DataChanged (const DataChangedEvent& rEvent)
ParaPropertyPanel::~ParaPropertyPanel()
{
- delete mpLnSPItem;
}
void ParaPropertyPanel::ReSize(bool /* bSize */)
@@ -487,10 +486,6 @@ void ParaPropertyPanel::NotifyItemUpdate(
StateChangedIndentImpl( nSID, eState, pState );
break;
- case SID_ATTR_PARA_LINESPACE:
- StateChangedLnSPImpl( nSID, eState, pState );
- break;
-
case SID_ATTR_PARA_ULSPACE:
StateChangedULImpl( nSID, eState, pState );
break;
@@ -657,18 +652,6 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
}
}
-void ParaPropertyPanel::StateChangedLnSPImpl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
-{
- meLnSpState = eState;
-
- if( pState && eState >= SfxItemState::DEFAULT )
- {
- if(mpLnSPItem)
- delete mpLnSPItem;
- mpLnSPItem = static_cast<SvxLineSpacingItem *>(pState->Clone());
- }
-}
-
void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
{
mpTopDist->SetMax( mpTopDist->Normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) );
@@ -798,8 +781,6 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent,
maSpace3 (SVX_RES(IMG_SPACE3)),
maIndHang (SVX_RES(IMG_INDENT_HANG)),
maTxtLeft (0),
- mpLnSPItem (NULL),
- meLnSpState (SfxItemState::DONTCARE),
mbOutLineLeft (false),
mbOutLineRight (false),
maUpper (0),
@@ -809,7 +790,6 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent,
m_eLRSpaceUnit(),
m_eULSpaceUnit(),
maLRSpaceControl (SID_ATTR_PARA_LRSPACE,*pBindings,*this),
- maLNSpaceControl (SID_ATTR_PARA_LINESPACE, *pBindings,*this),
maULSpaceControl (SID_ATTR_PARA_ULSPACE, *pBindings,*this),
maOutLineLeftControl(SID_OUTLINE_LEFT, *pBindings, *this, OUString("OutlineRight"), rxFrame),
maOutLineRightControl(SID_OUTLINE_RIGHT, *pBindings, *this, OUString("OutlineLeft"), rxFrame),
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index b79f33a79647..8d4782500ac0 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -86,9 +86,6 @@ private:
// Data Member
long maTxtLeft;
- //Line spacing
- SvxLineSpacingItem *mpLnSPItem;
- SfxItemState meLnSpState;
bool mbOutLineLeft;
bool mbOutLineRight;
long maUpper;
@@ -100,7 +97,6 @@ private:
SfxMapUnit m_eULSpaceUnit;
// Control Items
::sfx2::sidebar::ControllerItem maLRSpaceControl;
- ::sfx2::sidebar::ControllerItem maLNSpaceControl;
::sfx2::sidebar::ControllerItem maULSpaceControl;
::sfx2::sidebar::ControllerItem maOutLineLeftControl;
::sfx2::sidebar::ControllerItem maOutLineRightControl;
@@ -127,7 +123,6 @@ private:
DECL_LINK(ClickUL_IncDec_Hdl_Impl, ToolBox*);
void StateChangedIndentImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
- void StateChangedLnSPImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
void StateChangedULImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
void StateChangeOutLineImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
void StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );