[Libreoffice-commits] core.git: cui/source filter/source include/svx sc/source sd/source svx/sdi svx/source sw/source
Stephan Bergmann
sbergman at redhat.com
Tue Aug 5 00:00:22 PDT 2014
cui/source/tabpages/tpshadow.cxx | 6 +++---
filter/source/msfilter/msdffimp.cxx | 2 +-
include/svx/sdshitm.hxx | 11 +++--------
sc/source/core/data/postit.cxx | 4 ++--
sc/source/core/tool/detfunc.cxx | 2 +-
sc/source/filter/excel/xiescher.cxx | 2 +-
sd/source/core/drawdoc4.cxx | 8 ++++----
sd/source/core/stlpool.cxx | 2 +-
svx/sdi/svx.sdi | 2 +-
svx/sdi/svxitems.sdi | 2 +-
svx/source/customshapes/EnhancedCustomShape2d.cxx | 6 +++---
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 2 +-
svx/source/engine3d/float3d.cxx | 2 +-
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 2 +-
svx/source/svdraw/svdattr.cxx | 2 +-
svx/source/svdraw/svdedtv2.cxx | 4 ++--
svx/source/svdraw/svdibrow.cxx | 2 +-
svx/source/svdraw/svdoashp.cxx | 10 +++++-----
svx/source/svdraw/svdotext.cxx | 4 ++--
svx/source/svdraw/svdotxtr.cxx | 2 +-
sw/source/filter/ww8/ww8graf.cxx | 4 ++--
21 files changed, 38 insertions(+), 43 deletions(-)
New commits:
commit 8d023edc181e040e290c0e42aa71191f567de8fe
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Aug 5 08:59:37 2014 +0200
Consistency around SdrOnOffItem in svx/sdshitm.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 "Remove unused ctors" and
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."
Change-Id: Id712c222034ef807ea2d7bc459e78882e948aca6
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index d1dfe22..13dc142 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -255,9 +255,9 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs )
TriState eState = m_pTsbShowShadow->GetState();
if( m_pTsbShowShadow->IsValueChangedFromSaved() )
{
- SdrShadowItem aItem( sal::static_int_cast< sal_Bool >( eState ) );
+ SdrOnOffItem aItem( makeSdrShadowItem(sal::static_int_cast< sal_Bool >( eState )) );
pOld = GetOldItem( *rAttrs, SDRATTR_SHADOW );
- if ( !pOld || !( *(const SdrShadowItem*)pOld == aItem ) )
+ if ( !pOld || !( *(const SdrOnOffItem*)pOld == aItem ) )
{
rAttrs->Put( aItem );
bModified = true;
@@ -366,7 +366,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
{
m_pTsbShowShadow->EnableTriState( false );
- if( ( ( const SdrShadowItem& ) rAttrs->Get( SDRATTR_SHADOW ) ).GetValue() )
+ if( ( ( const SdrOnOffItem& ) rAttrs->Get( SDRATTR_SHADOW ) ).GetValue() )
m_pTsbShowShadow->SetState( TRISTATE_TRUE );
else
{
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 73a73d7..f3105e7 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2628,7 +2628,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObj
}
if ( bHasShadow )
- rSet.Put( SdrShadowItem( bHasShadow ) );
+ rSet.Put( makeSdrShadowItem( bHasShadow ) );
}
ApplyLineAttributes( rSet, rObjData.eShapeType ); // #i28269#
ApplyFillAttributes( rIn, rSet, rObjData );
diff --git a/include/svx/sdshitm.hxx b/include/svx/sdshitm.hxx
index 7613870..ab8a2b8 100644
--- a/include/svx/sdshitm.hxx
+++ b/include/svx/sdshitm.hxx
@@ -22,14 +22,9 @@
#include <svx/sdooitm.hxx>
#include <svx/svddef.hxx>
-/*
- * class SdrShadowItem
- */
-class SdrShadowItem: public SdrOnOffItem {
-public:
- SdrShadowItem(bool bShadow=false): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {}
- SdrShadowItem(SvStream& rIn): SdrOnOffItem(SDRATTR_SHADOW, rIn) {}
-};
+inline SdrOnOffItem makeSdrShadowItem(bool bShadow) {
+ return SdrOnOffItem(SDRATTR_SHADOW, bShadow);
+}
#endif
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 673640f..433138d 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -123,7 +123,7 @@ void ScCaptionUtil::SetDefaultItems( SdrCaptionObj& rCaption, ScDocument& rDoc )
/* SdrShadowItem has sal_False, instead the shadow is set for the
rectangle only with SetSpecialTextBoxShadow() when the object is
created (item must be set to adjust objects from older files). */
- aItemSet.Put( SdrShadowItem( false ) );
+ aItemSet.Put( makeSdrShadowItem( false ) );
aItemSet.Put( SdrShadowXDistItem( 100 ) );
aItemSet.Put( SdrShadowYDistItem( 100 ) );
@@ -146,7 +146,7 @@ void ScCaptionUtil::SetCaptionItems( SdrCaptionObj& rCaption, const SfxItemSet&
// copy all items
rCaption.SetMergedItemSet( rItemSet );
// reset shadow items
- rCaption.SetMergedItem( SdrShadowItem( false ) );
+ rCaption.SetMergedItem( makeSdrShadowItem( false ) );
rCaption.SetMergedItem( SdrShadowXDistItem( 100 ) );
rCaption.SetMergedItem( SdrShadowYDistItem( 100 ) );
rCaption.SetSpecialTextBoxShadow();
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 102155c..6e12d9c 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -214,7 +214,7 @@ ScCommentData::ScCommentData( ScDocument& rDoc, SdrModel* pModel ) :
// SdrShadowItem has sal_False, instead the shadow is set for the rectangle
// only with SetSpecialTextBoxShadow when the object is created
// (item must be set to adjust objects from older files)
- aCaptionSet.Put( SdrShadowItem( false ) );
+ aCaptionSet.Put( makeSdrShadowItem( false ) );
aCaptionSet.Put( SdrShadowXDistItem( 100 ) );
aCaptionSet.Put( SdrShadowYDistItem( 100 ) );
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index b14ae22..1791ef3 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -768,7 +768,7 @@ void XclImpDrawObjBase::ConvertFrameStyle( SdrObject& rSdrObj, sal_uInt16 nFrame
{
if( ::get_flag( nFrameFlags, EXC_OBJ_FRAME_SHADOW ) )
{
- rSdrObj.SetMergedItem( SdrShadowItem( true ) );
+ rSdrObj.SetMergedItem( makeSdrShadowItem( true ) );
rSdrObj.SetMergedItem( SdrShadowXDistItem( 35 ) );
rSdrObj.SetMergedItem( SdrShadowYDistItem( 35 ) );
rSdrObj.SetMergedItem( SdrShadowColorItem( GetPalette().GetColor( EXC_COLOR_WINDOWTEXT ) ) );
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index f15d1e5..f4ba67f 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -175,7 +175,7 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put(XFillBitmapItem(pPool, Graphic(aNullBmp)));
// Shadow attributes (Drawing Engine)
- rISet.Put(SdrShadowItem(false));
+ rISet.Put(makeSdrShadowItem(false));
rISet.Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
rISet.Put(SdrShadowXDistItem(200)); // 3 mm Shadow distance
rISet.Put(SdrShadowYDistItem(200));
@@ -283,7 +283,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHSHADOW );
pISet = &pSheet->GetItemSet();
- pISet->Put(SdrShadowItem(true));
+ pISet->Put(makeSdrShadowItem(true));
pISet->Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
pISet->Put(SdrShadowXDistItem(200)); // 3 mm shadow distance
pISet->Put(SdrShadowYDistItem(200));
@@ -382,7 +382,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XFillStyleItem(drawing::FillStyle_SOLID));
pISet->Put(XFillColorItem(OUString(), RGB_Color(COL_CYAN)));
- pISet->Put(SdrShadowItem(true));
+ pISet->Put(makeSdrShadowItem(true));
pISet->Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
pISet->Put(SdrShadowXDistItem(200)); // 2 mm shadow distance
pISet->Put(SdrShadowYDistItem(200));
@@ -406,7 +406,7 @@ void SdDrawDocument::CreateLayoutTemplates()
Color aOrange4(255, 204, 153);
pISet->Put(XFillColorItem(OUString(), aOrange4));
- pISet->Put(SdrShadowItem(true));
+ pISet->Put(makeSdrShadowItem(true));
pISet->Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
pISet->Put(SdrShadowXDistItem(200)); // 2 mm shadow distance
pISet->Put(SdrShadowYDistItem(200));
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 79475e5..824e05a 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -486,7 +486,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUNDOBJECTS );
pSheet->SetParent( OUString() );
SfxItemSet& rBackgroundObjectsSet = pSheet->GetItemSet();
- rBackgroundObjectsSet.Put(SdrShadowItem(false));
+ rBackgroundObjectsSet.Put(makeSdrShadowItem(false));
rBackgroundObjectsSet.Put(SdrShadowColorItem(Color(COL_GRAY)));
rBackgroundObjectsSet.Put(SdrShadowXDistItem(200)); // 3 mm shadow distance
rBackgroundObjectsSet.Put(SdrShadowYDistItem(200));
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 3673283..374c6fb 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -10308,7 +10308,7 @@ SvxShadowItem BorderShadow SID_ATTR_BORDER_SHADOW
]
-SdrShadowItem FillShadow SID_ATTR_FILL_SHADOW
+SdrOnOffItem FillShadow SID_ATTR_FILL_SHADOW
[
/* flags: */
diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi
index c59fa16..cdfea24 100644
--- a/svx/sdi/svxitems.sdi
+++ b/svx/sdi/svxitems.sdi
@@ -389,7 +389,7 @@ item BOOL SvxWordLineModeItem;
item SvxCellHorJustifyEnum SvxHorJustifyItem;
item SvxCellVerJustifyEnum SvxVerJustifyItem;
item SvxCellOrientationEnum SvxOrientationItem;
-item BOOL SdrShadowItem;
+item BOOL SdrOnOffItem;
item INT16 SdrTextFitToSizeTypeItem; // enum
item String SfxStringListItem; // serialized into one concatenated string
item double SvxDoubleItem;
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 8d42e38..8fee034 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1987,7 +1987,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
aClosedPolyPolygon.setClosed(true);
SdrPathObj* pFill = new SdrPathObj(OBJ_POLY, aClosedPolyPolygon, dBrightness);
SfxItemSet aTempSet(*this);
- aTempSet.Put(SdrShadowItem(false));
+ aTempSet.Put(makeSdrShadowItem(false));
aTempSet.Put(XLineStyleItem(XLINE_NONE));
pFill->SetMergedItemSet(aTempSet);
rObjectList.push_back(pFill);
@@ -2003,7 +2003,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
aNewB2DPolyPolygon.isClosed() ? OBJ_POLY : OBJ_PLIN,
aNewB2DPolyPolygon, dBrightness);
SfxItemSet aTempSet(*this);
- aTempSet.Put(SdrShadowItem(false));
+ aTempSet.Put(makeSdrShadowItem(false));
aTempSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
pStroke->SetMergedItemSet(aTempSet);
rObjectList.push_back(pStroke);
@@ -2013,7 +2013,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
{
SdrPathObj* pObj = 0;
SfxItemSet aTempSet(*this);
- aTempSet.Put(SdrShadowItem(false));
+ aTempSet.Put(makeSdrShadowItem(false));
if(bNoFill)
{
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 1371caa..f46a514 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -812,7 +812,7 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const Sd
SfxItemSet aSet( pCustomShape->GetMergedItemSet() );
aSet.ClearItem( SDRATTR_TEXTDIRECTION ); //SJ: vertical writing is not required, by removing this item no outliner is created
- aSet.Put(SdrShadowItem(false)); // #i37011# NO shadow for FontWork geometry
+ aSet.Put(makeSdrShadowItem(false)); // #i37011# NO shadow for FontWork geometry
pRet->SetMergedItemSet( aSet ); // * otherwise we would crash, because the outliner tries to create a Paraobject, but there is no model
}
return pRet;
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 2c6cf4b..3b5f45f 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -1871,7 +1871,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
{
bool bValue = TRISTATE_TRUE == eState;
rAttrs.Put(Svx3DShadow3DItem(bValue));
- rAttrs.Put(SdrShadowItem(bValue));
+ rAttrs.Put(makeSdrShadowItem(bValue));
}
else
{
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 858d1aa..ac87b70 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -335,7 +335,7 @@ namespace drawinglayer
attribute::SdrShadowAttribute createNewSdrShadowAttribute(const SfxItemSet& rSet)
{
- const bool bShadow(((SdrShadowItem&)rSet.Get(SDRATTR_SHADOW)).GetValue());
+ const bool bShadow(((SdrOnOffItem&)rSet.Get(SDRATTR_SHADOW)).GetValue());
if(bShadow)
{
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 83460b7..df7399e 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -128,7 +128,7 @@ SdrItemPool::SdrItemPool(
}
// init own PoolDefaults
- mppLocalPoolDefaults[SDRATTR_SHADOW -SDRATTR_START]=new SdrShadowItem;
+ mppLocalPoolDefaults[SDRATTR_SHADOW -SDRATTR_START]=new SdrOnOffItem(SDRATTR_SHADOW, false);
mppLocalPoolDefaults[SDRATTR_SHADOWCOLOR -SDRATTR_START]=new SdrShadowColorItem(aNullCol);
mppLocalPoolDefaults[SDRATTR_SHADOWXDIST -SDRATTR_START]=new SdrShadowXDistItem;
mppLocalPoolDefaults[SDRATTR_SHADOWYDIST -SDRATTR_START]=new SdrShadowYDistItem;
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index cf03ff5..1825434 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1541,11 +1541,11 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
DBG_ASSERT(pCandidate, "SdrEditView::ImpDismantleOneObject: Could not clone SdrObject (!)");
pCandidate->SetModel(pCustomShape->GetModel());
- if(((SdrShadowItem&)pCustomShape->GetMergedItem(SDRATTR_SHADOW)).GetValue())
+ if(((SdrOnOffItem&)pCustomShape->GetMergedItem(SDRATTR_SHADOW)).GetValue())
{
if(pReplacement->ISA(SdrObjGroup))
{
- pCandidate->SetMergedItem(SdrShadowItem(true));
+ pCandidate->SetMergedItem(makeSdrShadowItem(true));
}
}
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 05de58c..13f2703 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -756,7 +756,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
case SDRATTR_SHADOWPERSP : {
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_SHADOW,pItem)) {
- bool bShadow=((const SdrShadowItem*)pItem)->GetValue();
+ bool bShadow=((const SdrOnOffItem*)pItem)->GetValue();
if (!bShadow) return true;
}
} break;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 1777714..bb6304b 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -206,7 +206,7 @@ static bool ImpVerticalSwitch( const SdrObjCustomShape& rCustoShape )
SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemSet& rOriginalSet)
{
SdrObject* pRetval = 0L;
- const bool bShadow(((SdrShadowItem&)rOriginalSet.Get(SDRATTR_SHADOW)).GetValue());
+ const bool bShadow(((SdrOnOffItem&)rOriginalSet.Get(SDRATTR_SHADOW)).GetValue());
if(bShadow)
{
@@ -280,7 +280,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
aTempSet.Put( SvxWritingModeItem( com::sun::star::text::WritingMode_LR_TB, SDRATTR_TEXTDIRECTION ) );
// no shadow
- aTempSet.Put(SdrShadowItem(false));
+ aTempSet.Put(makeSdrShadowItem(false));
aTempSet.Put(SdrShadowXDistItem(0L));
aTempSet.Put(SdrShadowYDistItem(0L));
@@ -456,7 +456,7 @@ const SdrObject* SdrObjCustomShape::GetSdrObjectShadowFromCustomShape() const
if(pSdrObject)
{
const SfxItemSet& rOriginalSet = GetObjectItemSet();
- const bool bShadow(((SdrShadowItem&)rOriginalSet.Get( SDRATTR_SHADOW )).GetValue());
+ const bool bShadow(((SdrOnOffItem&)rOriginalSet.Get( SDRATTR_SHADOW )).GetValue());
if(bShadow)
{
@@ -2906,10 +2906,10 @@ SdrObject* SdrObjCustomShape::DoConvertToPolyObj(bool bBezier, bool bAddText) co
if(pRetval)
{
- const bool bShadow(((SdrShadowItem&)GetMergedItem(SDRATTR_SHADOW)).GetValue());
+ const bool bShadow(((SdrOnOffItem&)GetMergedItem(SDRATTR_SHADOW)).GetValue());
if(bShadow)
{
- pRetval->SetMergedItem(SdrShadowItem(true));
+ pRetval->SetMergedItem(makeSdrShadowItem(true));
}
}
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 225d0dd..4586035 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -618,7 +618,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho
// test if shadow needs to be avoided for TakeContour()
const SfxItemSet& rSet = GetObjectItemSet();
- bool bShadowOn = ((SdrShadowItem&)(rSet.Get(SDRATTR_SHADOW))).GetValue();
+ bool bShadowOn = ((SdrOnOffItem&)(rSet.Get(SDRATTR_SHADOW))).GetValue();
// #i33696#
// Remember TextObject currently set at the DrawOutliner, it WILL be
@@ -630,7 +630,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho
{
// force shadow off
SdrObject* pCopy = Clone();
- pCopy->SetMergedItem(SdrShadowItem(false));
+ pCopy->SetMergedItem(makeSdrShadowItem(false));
*pContourPolyPolygon = pCopy->TakeContour();
SdrObject::Free( pCopy );
}
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 22bc44f..e4da47d 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -372,7 +372,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const
SdrPathObj* pPathObj = 0;
// always clear objectshadow; this is included in the extraction
- aAttributeSet.Put(SdrShadowItem(false));
+ aAttributeSet.Put(makeSdrShadowItem(false));
if(rCandidate.getIsFilled())
{
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index a488e49..1445ce5 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -231,7 +231,7 @@ static void SetStdAttr( SfxItemSet& rSet, WW8_DP_LINETYPE& rL,
}
}
if( SVBT16ToShort( rSh.shdwpi ) ){ // shadow
- rSet.Put(SdrShadowItem(true));
+ rSet.Put(makeSdrShadowItem(true));
rSet.Put( SdrShadowXDistItem( SVBT16ToShort( rSh.xaOffset ) ) );
rSet.Put( SdrShadowYDistItem( SVBT16ToShort( rSh.yaOffset ) ) );
}
@@ -1694,7 +1694,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
rFlySet.Put( aBox );
// Schattenwurf der Box: SvxShadowItem
- if( WW8ITEMVALUE(rOldSet, SDRATTR_SHADOW, SdrShadowItem) )
+ if( WW8ITEMVALUE(rOldSet, SDRATTR_SHADOW, SdrOnOffItem) )
{
SvxShadowItem aShadow( RES_SHADOW );
More information about the Libreoffice-commits
mailing list