Kaydet (Commit) 3e1dc286 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky

Cleanup some leftovers from the line spacing popup conversion

Change-Id: Ia2e35461958ea5d79241fa2231bd7ef164fc378d
üst 8e5ac3ba
...@@ -197,7 +197,6 @@ void ParaPropertyPanel::DataChanged (const DataChangedEvent& rEvent) ...@@ -197,7 +197,6 @@ void ParaPropertyPanel::DataChanged (const DataChangedEvent& rEvent)
ParaPropertyPanel::~ParaPropertyPanel() ParaPropertyPanel::~ParaPropertyPanel()
{ {
delete mpLnSPItem;
} }
void ParaPropertyPanel::ReSize(bool /* bSize */) void ParaPropertyPanel::ReSize(bool /* bSize */)
...@@ -487,10 +486,6 @@ void ParaPropertyPanel::NotifyItemUpdate( ...@@ -487,10 +486,6 @@ void ParaPropertyPanel::NotifyItemUpdate(
StateChangedIndentImpl( nSID, eState, pState ); StateChangedIndentImpl( nSID, eState, pState );
break; break;
case SID_ATTR_PARA_LINESPACE:
StateChangedLnSPImpl( nSID, eState, pState );
break;
case SID_ATTR_PARA_ULSPACE: case SID_ATTR_PARA_ULSPACE:
StateChangedULImpl( nSID, eState, pState ); StateChangedULImpl( nSID, eState, pState );
break; break;
...@@ -657,18 +652,6 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat ...@@ -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 ) void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
{ {
mpTopDist->SetMax( mpTopDist->Normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) ); mpTopDist->SetMax( mpTopDist->Normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) );
...@@ -798,8 +781,6 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent, ...@@ -798,8 +781,6 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent,
maSpace3 (SVX_RES(IMG_SPACE3)), maSpace3 (SVX_RES(IMG_SPACE3)),
maIndHang (SVX_RES(IMG_INDENT_HANG)), maIndHang (SVX_RES(IMG_INDENT_HANG)),
maTxtLeft (0), maTxtLeft (0),
mpLnSPItem (NULL),
meLnSpState (SfxItemState::DONTCARE),
mbOutLineLeft (false), mbOutLineLeft (false),
mbOutLineRight (false), mbOutLineRight (false),
maUpper (0), maUpper (0),
...@@ -809,7 +790,6 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent, ...@@ -809,7 +790,6 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent,
m_eLRSpaceUnit(), m_eLRSpaceUnit(),
m_eULSpaceUnit(), m_eULSpaceUnit(),
maLRSpaceControl (SID_ATTR_PARA_LRSPACE,*pBindings,*this), maLRSpaceControl (SID_ATTR_PARA_LRSPACE,*pBindings,*this),
maLNSpaceControl (SID_ATTR_PARA_LINESPACE, *pBindings,*this),
maULSpaceControl (SID_ATTR_PARA_ULSPACE, *pBindings,*this), maULSpaceControl (SID_ATTR_PARA_ULSPACE, *pBindings,*this),
maOutLineLeftControl(SID_OUTLINE_LEFT, *pBindings, *this, OUString("OutlineRight"), rxFrame), maOutLineLeftControl(SID_OUTLINE_LEFT, *pBindings, *this, OUString("OutlineRight"), rxFrame),
maOutLineRightControl(SID_OUTLINE_RIGHT, *pBindings, *this, OUString("OutlineLeft"), rxFrame), maOutLineRightControl(SID_OUTLINE_RIGHT, *pBindings, *this, OUString("OutlineLeft"), rxFrame),
......
...@@ -86,9 +86,6 @@ private: ...@@ -86,9 +86,6 @@ private:
// Data Member // Data Member
long maTxtLeft; long maTxtLeft;
//Line spacing
SvxLineSpacingItem *mpLnSPItem;
SfxItemState meLnSpState;
bool mbOutLineLeft; bool mbOutLineLeft;
bool mbOutLineRight; bool mbOutLineRight;
long maUpper; long maUpper;
...@@ -100,7 +97,6 @@ private: ...@@ -100,7 +97,6 @@ private:
SfxMapUnit m_eULSpaceUnit; SfxMapUnit m_eULSpaceUnit;
// Control Items // Control Items
::sfx2::sidebar::ControllerItem maLRSpaceControl; ::sfx2::sidebar::ControllerItem maLRSpaceControl;
::sfx2::sidebar::ControllerItem maLNSpaceControl;
::sfx2::sidebar::ControllerItem maULSpaceControl; ::sfx2::sidebar::ControllerItem maULSpaceControl;
::sfx2::sidebar::ControllerItem maOutLineLeftControl; ::sfx2::sidebar::ControllerItem maOutLineLeftControl;
::sfx2::sidebar::ControllerItem maOutLineRightControl; ::sfx2::sidebar::ControllerItem maOutLineRightControl;
...@@ -127,7 +123,6 @@ private: ...@@ -127,7 +123,6 @@ private:
DECL_LINK(ClickUL_IncDec_Hdl_Impl, ToolBox*); DECL_LINK(ClickUL_IncDec_Hdl_Impl, ToolBox*);
void StateChangedIndentImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); 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 StateChangedULImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
void StateChangeOutLineImpl( 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 ); void StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment