include/svx/sxcaitm.hxx | 10 +--------- svx/source/svdraw/svdattr.cxx | 2 +- svx/source/svdraw/svdibrow.cxx | 2 +- svx/source/svdraw/svdocapt.cxx | 4 ++-- 4 files changed, 5 insertions(+), 13 deletions(-)
New commits: commit 0765c16b6a738974fee600280b82dc46bb06b3b6 Author: Stephan Bergmann <[email protected]> Date: Tue Aug 12 17:35:51 2014 +0200 Consistency around SdrOnOffItem in svx/sxcaitm.hxx ...similar to what has been done for svx/sdtmfitm.hxx in 6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 "Remove unused ctors" and 68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem." Change-Id: I1a88c73c8e4c764a6beadb8bb54910d868a12d93 diff --git a/include/svx/sxcaitm.hxx b/include/svx/sxcaitm.hxx index 7961ff0..3b56f35 100644 --- a/include/svx/sxcaitm.hxx +++ b/include/svx/sxcaitm.hxx @@ -24,18 +24,10 @@ #include <svx/sdangitm.hxx> #include <svx/sdooitm.hxx> - -// class SdrCaptionFixedAngleItem +// SDRATTR_CAPTIONFIXEDANGLE SdrOnOffItem: // sal_True=Winkel durch SdrCaptionAngleItem vorgegeben // sal_False=Freier Winkel -class SdrCaptionFixedAngleItem: public SdrOnOffItem { -public: - SdrCaptionFixedAngleItem(bool bFix=true): SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {} - SdrCaptionFixedAngleItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,rIn) {} -}; - - // class SdrCaptionAngleItem // Winkelangabe in 1/100 Degree // Nur bei Type2, Type3 und Type4 diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index c11106e..f5a275b 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -136,7 +136,7 @@ SdrItemPool::SdrItemPool( mppLocalPoolDefaults[SDRATTR_SHADOW3D -SDRATTR_START]=new SfxVoidItem(SDRATTR_SHADOW3D ); mppLocalPoolDefaults[SDRATTR_SHADOWPERSP -SDRATTR_START]=new SfxVoidItem(SDRATTR_SHADOWPERSP ); mppLocalPoolDefaults[SDRATTR_CAPTIONTYPE -SDRATTR_START]=new SdrCaptionTypeItem ; - mppLocalPoolDefaults[SDRATTR_CAPTIONFIXEDANGLE-SDRATTR_START]=new SdrCaptionFixedAngleItem; + mppLocalPoolDefaults[SDRATTR_CAPTIONFIXEDANGLE-SDRATTR_START]=new SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE, true); mppLocalPoolDefaults[SDRATTR_CAPTIONANGLE -SDRATTR_START]=new SdrCaptionAngleItem ; mppLocalPoolDefaults[SDRATTR_CAPTIONGAP -SDRATTR_START]=new SdrCaptionGapItem ; mppLocalPoolDefaults[SDRATTR_CAPTIONESCDIR -SDRATTR_START]=new SdrCaptionEscDirItem ; diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 13f2703..70e30e6 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -764,7 +764,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI case SDRATTR_CAPTIONANGLE: { rIndent=1; if (ImpGetItem(*pSet,SDRATTR_CAPTIONFIXEDANGLE,pItem)) { - bool bFixed=((const SdrCaptionFixedAngleItem*)pItem)->GetValue(); + bool bFixed=((const SdrOnOffItem*)pItem)->GetValue(); if (!bFixed) return true; } } break; diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 866d60f..583222a 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -421,7 +421,7 @@ void SdrCaptionObj::ImpGetCaptParams(ImpCaptParams& rPara) const { const SfxItemSet& rSet = GetObjectItemSet(); rPara.eType =((SdrCaptionTypeItem&) (rSet.Get(SDRATTR_CAPTIONTYPE ))).GetValue(); - rPara.bFixedAngle=((SdrCaptionFixedAngleItem&)(rSet.Get(SDRATTR_CAPTIONFIXEDANGLE))).GetValue(); + rPara.bFixedAngle=((SdrOnOffItem&)(rSet.Get(SDRATTR_CAPTIONFIXEDANGLE))).GetValue(); rPara.nAngle =((SdrCaptionAngleItem&) (rSet.Get(SDRATTR_CAPTIONANGLE ))).GetValue(); rPara.nGap =((SdrCaptionGapItem&) (rSet.Get(SDRATTR_CAPTIONGAP ))).GetValue(); rPara.eEscDir =((SdrCaptionEscDirItem&) (rSet.Get(SDRATTR_CAPTIONESCDIR ))).GetValue(); commit 81bf87fec424e1d907a866d439559b7d69dee0db Author: Stephan Bergmann <[email protected]> Date: Tue Aug 12 16:59:46 2014 +0200 Fix apparent SdrCaptionAngleItem vs. SdrCaptionFixedAngleItem mismatch ...though it was like that ever since fd069bee7e57ad529c3c0974559fd2d84ec3151a "initial import" Change-Id: Ib3efe7bf7a559ede52966f4763a9f9e748b6ba6a diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 4eaefcb..866d60f 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -421,8 +421,8 @@ void SdrCaptionObj::ImpGetCaptParams(ImpCaptParams& rPara) const { const SfxItemSet& rSet = GetObjectItemSet(); rPara.eType =((SdrCaptionTypeItem&) (rSet.Get(SDRATTR_CAPTIONTYPE ))).GetValue(); - rPara.bFixedAngle=((SdrCaptionFixedAngleItem&)(rSet.Get(SDRATTR_CAPTIONANGLE ))).GetValue(); - rPara.nAngle =((SdrCaptionAngleItem&) (rSet.Get(SDRATTR_CAPTIONFIXEDANGLE))).GetValue(); + rPara.bFixedAngle=((SdrCaptionFixedAngleItem&)(rSet.Get(SDRATTR_CAPTIONFIXEDANGLE))).GetValue(); + rPara.nAngle =((SdrCaptionAngleItem&) (rSet.Get(SDRATTR_CAPTIONANGLE ))).GetValue(); rPara.nGap =((SdrCaptionGapItem&) (rSet.Get(SDRATTR_CAPTIONGAP ))).GetValue(); rPara.eEscDir =((SdrCaptionEscDirItem&) (rSet.Get(SDRATTR_CAPTIONESCDIR ))).GetValue(); rPara.bEscRel =((SdrCaptionEscIsRelItem&) (rSet.Get(SDRATTR_CAPTIONESCISREL ))).GetValue(); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
