diff options
| -rw-r--r-- | include/svx/sxcaitm.hxx | 10 | ||||
| -rw-r--r-- | svx/source/svdraw/svdattr.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdibrow.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdocapt.cxx | 2 |
4 files changed, 4 insertions, 12 deletions
diff --git a/include/svx/sxcaitm.hxx b/include/svx/sxcaitm.hxx index 7961ff0b256f..3b56f3504360 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 c11106e26d98..f5a275b2276b 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 13f270303709..70e30e67dbfd 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 866d60f52196..583222a1cab2 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(); |