Skip to content

C
core
Kaydet (Commit) 14ac70c7 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Consistency around SdrMetricItem in svx/sxelditm.hxx 

...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81c "Remove unused ctors" and
68969cc6 "Consistency around SdrMetricItem."

(SdrEdgeLine1DeltaItem::Clone had been recently---and in retrospect needlessly
---introduced in 596ec6f5 "Missing
SdrEdgeLine1DeltaItem::Clone override" before
3efa3ad7 "SdrEdgreLine*DeltaItem::Put/QueryValue
are same as underlying" revealed that SdrEdgeLine1DeltaItem was a needless
derivation of SdrMetricItem.)

Change-Id: I154d32d46a7c01c792aa4e812cf576d4d749e0c9
üst 3efa3ad7
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 45 deletions
cui/source/tabpages/connect.cxx
Dosyayı görüntüle @ 14ac70c7
...@@ -224,7 +224,7 @@ void SvxConnectionPage::Reset( const SfxItemSet* rAttrs ) ...@@ -224,7 +224,7 @@ void SvxConnectionPage::Reset( const SfxItemSet* rAttrs )
pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE1DELTA ); pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE1DELTA );
if( pItem ) if( pItem )
{ {
long nValue = ( ( const SdrEdgeLine1DeltaItem* )pItem )->GetValue(); long nValue = ( ( const SdrMetricItem* )pItem )->GetValue();
SetMetricValue( *m_pMtrFldLine1, nValue, eUnit ); SetMetricValue( *m_pMtrFldLine1, nValue, eUnit );
} }
else else
...@@ -238,7 +238,7 @@ void SvxConnectionPage::Reset( const SfxItemSet* rAttrs ) ...@@ -238,7 +238,7 @@ void SvxConnectionPage::Reset( const SfxItemSet* rAttrs )
pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE2DELTA ); pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE2DELTA );
if( pItem ) if( pItem )
{ {
long nValue = ( ( const SdrEdgeLine2DeltaItem* )pItem )->GetValue(); long nValue = ( ( const SdrMetricItem* )pItem )->GetValue();
SetMetricValue( *m_pMtrFldLine2, nValue, eUnit ); SetMetricValue( *m_pMtrFldLine2, nValue, eUnit );
} }
else else
...@@ -252,7 +252,7 @@ void SvxConnectionPage::Reset( const SfxItemSet* rAttrs ) ...@@ -252,7 +252,7 @@ void SvxConnectionPage::Reset( const SfxItemSet* rAttrs )
pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE3DELTA ); pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE3DELTA );
if( pItem ) if( pItem )
{ {
long nValue = ( ( const SdrEdgeLine3DeltaItem* )pItem )->GetValue(); long nValue = ( ( const SdrMetricItem* )pItem )->GetValue();
SetMetricValue( *m_pMtrFldLine3, nValue, eUnit ); SetMetricValue( *m_pMtrFldLine3, nValue, eUnit );
} }
else else
...@@ -343,21 +343,21 @@ bool SvxConnectionPage::FillItemSet( SfxItemSet* rAttrs) ...@@ -343,21 +343,21 @@ bool SvxConnectionPage::FillItemSet( SfxItemSet* rAttrs)
if( m_pMtrFldLine1->IsValueChangedFromSaved() ) if( m_pMtrFldLine1->IsValueChangedFromSaved() )
{ {
nValue = GetCoreValue( *m_pMtrFldLine1, eUnit ); nValue = GetCoreValue( *m_pMtrFldLine1, eUnit );
rAttrs->Put( SdrEdgeLine1DeltaItem( nValue ) ); rAttrs->Put( makeSdrEdgeLine1DeltaItem( nValue ) );
bModified = true; bModified = true;
} }
if( m_pMtrFldLine2->IsValueChangedFromSaved() ) if( m_pMtrFldLine2->IsValueChangedFromSaved() )
{ {
nValue = GetCoreValue( *m_pMtrFldLine2, eUnit ); nValue = GetCoreValue( *m_pMtrFldLine2, eUnit );
rAttrs->Put( SdrEdgeLine2DeltaItem( nValue ) ); rAttrs->Put( makeSdrEdgeLine2DeltaItem( nValue ) );
bModified = true; bModified = true;
} }
if( m_pMtrFldLine3->IsValueChangedFromSaved() ) if( m_pMtrFldLine3->IsValueChangedFromSaved() )
{ {
nValue = GetCoreValue( *m_pMtrFldLine3, eUnit ); nValue = GetCoreValue( *m_pMtrFldLine3, eUnit );
rAttrs->Put( SdrEdgeLine3DeltaItem( nValue ) ); rAttrs->Put( makeSdrEdgeLine3DeltaItem( nValue ) );
bModified = true; bModified = true;
} }
...@@ -429,19 +429,19 @@ IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p ) ...@@ -429,19 +429,19 @@ IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p )
if( p == m_pMtrFldLine1 ) if( p == m_pMtrFldLine1 )
{ {
sal_Int32 nValue = GetCoreValue( *m_pMtrFldLine1, eUnit ); sal_Int32 nValue = GetCoreValue( *m_pMtrFldLine1, eUnit );
aAttrSet.Put( SdrEdgeLine1DeltaItem( nValue ) ); aAttrSet.Put( makeSdrEdgeLine1DeltaItem( nValue ) );
} }
if( p == m_pMtrFldLine2 ) if( p == m_pMtrFldLine2 )
{ {
sal_Int32 nValue = GetCoreValue( *m_pMtrFldLine2, eUnit ); sal_Int32 nValue = GetCoreValue( *m_pMtrFldLine2, eUnit );
aAttrSet.Put( SdrEdgeLine2DeltaItem( nValue ) ); aAttrSet.Put( makeSdrEdgeLine2DeltaItem( nValue ) );
} }
if( p == m_pMtrFldLine3 ) if( p == m_pMtrFldLine3 )
{ {
sal_Int32 nValue = GetCoreValue( *m_pMtrFldLine3, eUnit ); sal_Int32 nValue = GetCoreValue( *m_pMtrFldLine3, eUnit );
aAttrSet.Put( SdrEdgeLine3DeltaItem( nValue ) ); aAttrSet.Put( makeSdrEdgeLine3DeltaItem( nValue ) );
} }
......
include/svx/sxelditm.hxx
Dosyayı görüntüle @ 14ac70c7
...@@ -29,24 +29,17 @@ public: ...@@ -29,24 +29,17 @@ public:
SdrEdgeLineDeltaAnzItem(SvStream& rIn): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,rIn) {} SdrEdgeLineDeltaAnzItem(SvStream& rIn): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,rIn) {}
}; };
class SVX_DLLPUBLIC SdrEdgeLine1DeltaItem: public SdrMetricItem { inline SdrMetricItem makeSdrEdgeLine1DeltaItem(long nVal) {
public: return SdrMetricItem(SDRATTR_EDGELINE1DELTA, nVal);
SdrEdgeLine1DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE1DELTA,nVal) {} }
SdrEdgeLine1DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE1DELTA,rIn) {}
virtual SfxPoolItem * Clone(SfxItemPool *) const SAL_OVERRIDE;
};
class SVX_DLLPUBLIC SdrEdgeLine2DeltaItem: public SdrMetricItem { inline SdrMetricItem makeSdrEdgeLine2DeltaItem(long nVal) {
public: return SdrMetricItem(SDRATTR_EDGELINE2DELTA, nVal);
SdrEdgeLine2DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE2DELTA,nVal) {} }
SdrEdgeLine2DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE2DELTA,rIn) {}
};
class SVX_DLLPUBLIC SdrEdgeLine3DeltaItem: public SdrMetricItem { inline SdrMetricItem makeSdrEdgeLine3DeltaItem(long nVal) {
public: return SdrMetricItem(SDRATTR_EDGELINE3DELTA, nVal);
SdrEdgeLine3DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE3DELTA,nVal) {} }
SdrEdgeLine3DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE3DELTA,rIn) {}
};
#endif #endif
......
sd/source/ui/view/drviewsj.cxx
Dosyayı görüntüle @ 14ac70c7
...@@ -205,9 +205,9 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) ...@@ -205,9 +205,9 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
aAttrSet.GetItemState( SDRATTR_EDGELINE2DELTA ) >= SFX_ITEM_AVAILABLE && aAttrSet.GetItemState( SDRATTR_EDGELINE2DELTA ) >= SFX_ITEM_AVAILABLE &&
aAttrSet.GetItemState( SDRATTR_EDGELINE3DELTA ) >= SFX_ITEM_AVAILABLE ) aAttrSet.GetItemState( SDRATTR_EDGELINE3DELTA ) >= SFX_ITEM_AVAILABLE )
{ {
long nVal1 = ( ( const SdrEdgeLine1DeltaItem& ) aAttrSet.Get( SDRATTR_EDGELINE1DELTA ) ).GetValue(); long nVal1 = ( ( const SdrMetricItem& ) aAttrSet.Get( SDRATTR_EDGELINE1DELTA ) ).GetValue();
long nVal2 = ( ( const SdrEdgeLine2DeltaItem& ) aAttrSet.Get( SDRATTR_EDGELINE2DELTA ) ).GetValue(); long nVal2 = ( ( const SdrMetricItem& ) aAttrSet.Get( SDRATTR_EDGELINE2DELTA ) ).GetValue();
long nVal3 = ( ( const SdrEdgeLine3DeltaItem& ) aAttrSet.Get( SDRATTR_EDGELINE3DELTA ) ).GetValue(); long nVal3 = ( ( const SdrMetricItem& ) aAttrSet.Get( SDRATTR_EDGELINE3DELTA ) ).GetValue();
{ {
if( nVal1 != 0 || nVal2 != 0 || nVal3 != 0 ) if( nVal1 != 0 || nVal2 != 0 || nVal3 != 0 )
bDisable = false; bDisable = false;
......
svx/source/svdraw/svdattr.cxx
Dosyayı görüntüle @ 14ac70c7
...@@ -180,9 +180,9 @@ SdrItemPool::SdrItemPool( ...@@ -180,9 +180,9 @@ SdrItemPool::SdrItemPool(
mppLocalPoolDefaults[SDRATTR_EDGENODE1GLUEDIST-SDRATTR_START]=new SdrEdgeNode1GlueDistItem; mppLocalPoolDefaults[SDRATTR_EDGENODE1GLUEDIST-SDRATTR_START]=new SdrEdgeNode1GlueDistItem;
mppLocalPoolDefaults[SDRATTR_EDGENODE2GLUEDIST-SDRATTR_START]=new SdrEdgeNode2GlueDistItem; mppLocalPoolDefaults[SDRATTR_EDGENODE2GLUEDIST-SDRATTR_START]=new SdrEdgeNode2GlueDistItem;
mppLocalPoolDefaults[SDRATTR_EDGELINEDELTAANZ -SDRATTR_START]=new SdrEdgeLineDeltaAnzItem; mppLocalPoolDefaults[SDRATTR_EDGELINEDELTAANZ -SDRATTR_START]=new SdrEdgeLineDeltaAnzItem;
mppLocalPoolDefaults[SDRATTR_EDGELINE1DELTA -SDRATTR_START]=new SdrEdgeLine1DeltaItem; mppLocalPoolDefaults[SDRATTR_EDGELINE1DELTA -SDRATTR_START]=new SdrMetricItem(SDRATTR_EDGELINE1DELTA, 0);
mppLocalPoolDefaults[SDRATTR_EDGELINE2DELTA -SDRATTR_START]=new SdrEdgeLine2DeltaItem; mppLocalPoolDefaults[SDRATTR_EDGELINE2DELTA -SDRATTR_START]=new SdrMetricItem(SDRATTR_EDGELINE2DELTA, 0);
mppLocalPoolDefaults[SDRATTR_EDGELINE3DELTA -SDRATTR_START]=new SdrEdgeLine3DeltaItem; mppLocalPoolDefaults[SDRATTR_EDGELINE3DELTA -SDRATTR_START]=new SdrMetricItem(SDRATTR_EDGELINE3DELTA, 0);
mppLocalPoolDefaults[SDRATTR_MEASUREKIND -SDRATTR_START]=new SdrMeasureKindItem; mppLocalPoolDefaults[SDRATTR_MEASUREKIND -SDRATTR_START]=new SdrMeasureKindItem;
mppLocalPoolDefaults[SDRATTR_MEASURETEXTHPOS -SDRATTR_START]=new SdrMeasureTextHPosItem; mppLocalPoolDefaults[SDRATTR_MEASURETEXTHPOS -SDRATTR_START]=new SdrMeasureTextHPosItem;
mppLocalPoolDefaults[SDRATTR_MEASURETEXTVPOS -SDRATTR_START]=new SdrMeasureTextVPosItem; mppLocalPoolDefaults[SDRATTR_MEASURETEXTVPOS -SDRATTR_START]=new SdrMeasureTextVPosItem;
...@@ -1747,11 +1747,6 @@ bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemb ...@@ -1747,11 +1747,6 @@ bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemb
return true; return true;
} }
SfxPoolItem * SdrEdgeLine1DeltaItem::Clone(SfxItemPool *) const
{
return new SdrEdgeLine1DeltaItem(*this);
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Measure // Measure
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......
svx/source/svdraw/svdoedge.cxx
Dosyayı görüntüle @ 14ac70c7
...@@ -194,9 +194,9 @@ void SdrEdgeObj::ImpSetAttrToEdgeInfo() ...@@ -194,9 +194,9 @@ void SdrEdgeObj::ImpSetAttrToEdgeInfo()
{ {
const SfxItemSet& rSet = GetObjectItemSet(); const SfxItemSet& rSet = GetObjectItemSet();
SdrEdgeKind eKind = ((SdrEdgeKindItem&)(rSet.Get(SDRATTR_EDGEKIND))).GetValue(); SdrEdgeKind eKind = ((SdrEdgeKindItem&)(rSet.Get(SDRATTR_EDGEKIND))).GetValue();
sal_Int32 nVal1 = ((SdrEdgeLine1DeltaItem&)rSet.Get(SDRATTR_EDGELINE1DELTA)).GetValue(); sal_Int32 nVal1 = ((SdrMetricItem&)rSet.Get(SDRATTR_EDGELINE1DELTA)).GetValue();
sal_Int32 nVal2 = ((SdrEdgeLine2DeltaItem&)rSet.Get(SDRATTR_EDGELINE2DELTA)).GetValue(); sal_Int32 nVal2 = ((SdrMetricItem&)rSet.Get(SDRATTR_EDGELINE2DELTA)).GetValue();
sal_Int32 nVal3 = ((SdrEdgeLine3DeltaItem&)rSet.Get(SDRATTR_EDGELINE3DELTA)).GetValue(); sal_Int32 nVal3 = ((SdrMetricItem&)rSet.Get(SDRATTR_EDGELINE3DELTA)).GetValue();
if(eKind == SDREDGE_ORTHOLINES || eKind == SDREDGE_BEZIER) if(eKind == SDREDGE_ORTHOLINES || eKind == SDREDGE_BEZIER)
{ {
...@@ -265,9 +265,9 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr() ...@@ -265,9 +265,9 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr()
const SfxItemSet& rSet = GetObjectItemSet(); const SfxItemSet& rSet = GetObjectItemSet();
SdrEdgeKind eKind = ((SdrEdgeKindItem&)(rSet.Get(SDRATTR_EDGEKIND))).GetValue(); SdrEdgeKind eKind = ((SdrEdgeKindItem&)(rSet.Get(SDRATTR_EDGEKIND))).GetValue();
sal_Int32 nValAnz = ((SdrEdgeLineDeltaAnzItem&)rSet.Get(SDRATTR_EDGELINEDELTAANZ)).GetValue(); sal_Int32 nValAnz = ((SdrEdgeLineDeltaAnzItem&)rSet.Get(SDRATTR_EDGELINEDELTAANZ)).GetValue();
sal_Int32 nVal1 = ((SdrEdgeLine1DeltaItem&)rSet.Get(SDRATTR_EDGELINE1DELTA)).GetValue(); sal_Int32 nVal1 = ((SdrMetricItem&)rSet.Get(SDRATTR_EDGELINE1DELTA)).GetValue();
sal_Int32 nVal2 = ((SdrEdgeLine2DeltaItem&)rSet.Get(SDRATTR_EDGELINE2DELTA)).GetValue(); sal_Int32 nVal2 = ((SdrMetricItem&)rSet.Get(SDRATTR_EDGELINE2DELTA)).GetValue();
sal_Int32 nVal3 = ((SdrEdgeLine3DeltaItem&)rSet.Get(SDRATTR_EDGELINE3DELTA)).GetValue(); sal_Int32 nVal3 = ((SdrMetricItem&)rSet.Get(SDRATTR_EDGELINE3DELTA)).GetValue();
sal_Int32 nVals[3] = { nVal1, nVal2, nVal3 }; sal_Int32 nVals[3] = { nVal1, nVal2, nVal3 };
sal_uInt16 n = 0; sal_uInt16 n = 0;
...@@ -323,17 +323,17 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr() ...@@ -323,17 +323,17 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr()
if(nVals[0] != nVal1) if(nVals[0] != nVal1)
{ {
GetProperties().SetObjectItemDirect(SdrEdgeLine1DeltaItem(nVals[0])); GetProperties().SetObjectItemDirect(makeSdrEdgeLine1DeltaItem(nVals[0]));
} }
if(nVals[1] != nVal2) if(nVals[1] != nVal2)
{ {
GetProperties().SetObjectItemDirect(SdrEdgeLine2DeltaItem(nVals[1])); GetProperties().SetObjectItemDirect(makeSdrEdgeLine2DeltaItem(nVals[1]));
} }
if(nVals[2] != nVal3) if(nVals[2] != nVal3)
{ {
GetProperties().SetObjectItemDirect(SdrEdgeLine3DeltaItem(nVals[2])); GetProperties().SetObjectItemDirect(makeSdrEdgeLine3DeltaItem(nVals[2]));
} }
if(n < 3) if(n < 3)
......
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