summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-01-30 10:40:45 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-01-30 10:49:35 +0000
commitd7ecbd0e655efb193da1561649ebd13fdd2f5af1 (patch)
tree387cdf66100dd07e4a1e6ad851611be39a64f779
parenta50ee91a17374d3ccfe277d9a0d27599a6ada789 (diff)
the name field for SdrShadowColorItem seems to be redundant now
Change-Id: I6e90cdfc9577bfa0ee1dd1018a41aa7979dfaf04
-rw-r--r--cui/source/tabpages/tpshadow.cxx3
-rw-r--r--filter/source/msfilter/msdffimp.cxx2
-rw-r--r--sc/source/filter/excel/xiescher.cxx2
-rw-r--r--sd/source/core/drawdoc4.cxx12
-rw-r--r--sd/source/core/stlpool.cxx2
-rw-r--r--svx/inc/svx/sdshcitm.hxx7
-rw-r--r--svx/inc/svx/xcolit.hxx1
-rw-r--r--svx/source/svdraw/svdattr.cxx2
-rw-r--r--svx/source/xoutdev/xattr.cxx6
9 files changed, 18 insertions, 19 deletions
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index c0fa6c2ba2a6..fa87c6ce3615 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -334,8 +334,7 @@ sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
if( nPos != LISTBOX_ENTRY_NOTFOUND &&
nPos != aLbShadowColor.GetSavedValue() )
{
- SdrShadowColorItem aItem( aLbShadowColor.GetSelectEntry(),
- aLbShadowColor.GetSelectEntryColor() );
+ SdrShadowColorItem aItem(aLbShadowColor.GetSelectEntryColor());
pOld = GetOldItem( rAttrs, SDRATTR_SHADOWCOLOR );
if ( !pOld || !( *(const SdrShadowColorItem*)pOld == aItem ) )
{
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 23ab741cada9..dda08b44f75d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2598,7 +2598,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObj
}
}
if ( IsProperty( DFF_Prop_shadowColor ) )
- rSet.Put( SdrShadowColorItem( OUString(), rManager.MSO_CLR_ToColor( GetPropertyValue( DFF_Prop_shadowColor ), DFF_Prop_shadowColor ) ) );
+ rSet.Put( SdrShadowColorItem( rManager.MSO_CLR_ToColor( GetPropertyValue( DFF_Prop_shadowColor ), DFF_Prop_shadowColor ) ) );
if ( IsProperty( DFF_Prop_shadowOpacity ) )
rSet.Put( SdrShadowTransparenceItem( (sal_uInt16)( ( 0x10000 - GetPropertyValue( DFF_Prop_shadowOpacity ) ) / 655 ) ) );
if ( IsProperty( DFF_Prop_shadowOffsetX ) )
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 24a5cc6e265d..3af643fb4d03 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -691,7 +691,7 @@ void XclImpDrawObjBase::ConvertFrameStyle( SdrObject& rSdrObj, sal_uInt16 nFrame
rSdrObj.SetMergedItem( SdrShadowItem( sal_True ) );
rSdrObj.SetMergedItem( SdrShadowXDistItem( 35 ) );
rSdrObj.SetMergedItem( SdrShadowYDistItem( 35 ) );
- rSdrObj.SetMergedItem( SdrShadowColorItem( EMPTY_STRING, GetPalette().GetColor( EXC_COLOR_WINDOWTEXT ) ) );
+ rSdrObj.SetMergedItem( SdrShadowColorItem( GetPalette().GetColor( EXC_COLOR_WINDOWTEXT ) ) );
}
}
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 3758a19fca43..4e5cf195f761 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -147,8 +147,6 @@ void SdDrawDocument::CreateLayoutTemplates()
SfxItemSet& rISet = pSheet->GetItemSet();
SfxItemPool* pPool = rISet.GetPool();
- String aNullStr;
-
::basegfx::B2DPolyPolygon aNullPolyPolygon;
Color aNullCol(RGB_Color(COL_DEFAULT_SHAPE_STROKE));
@@ -185,7 +183,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Schattenattribute (Drawing Engine)
rISet.Put(SdrShadowItem(sal_False));
- rISet.Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY)));
+ rISet.Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
rISet.Put(SdrShadowXDistItem(200)); // 3 mm Schattendistanz
rISet.Put(SdrShadowYDistItem(200));
@@ -294,7 +292,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(SdrShadowItem(sal_True));
- pISet->Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY)));
+ pISet->Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
pISet->Put(SdrShadowXDistItem(200)); // 3 mm Schattendistanz
pISet->Put(SdrShadowYDistItem(200));
@@ -387,7 +385,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XFillColorItem(String(), RGB_Color(COL_CYAN)));
pISet->Put(SdrShadowItem(sal_True));
- pISet->Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY)));
+ pISet->Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
pISet->Put(SdrShadowXDistItem(200)); // 2 mm Schattendistanz
pISet->Put(SdrShadowYDistItem(200));
@@ -411,7 +409,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XFillColorItem(String(), aOrange4));
pISet->Put(SdrShadowItem(sal_True));
- pISet->Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY)));
+ pISet->Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
pISet->Put(SdrShadowXDistItem(200)); // 2 mm Schattendistanz
pISet->Put(SdrShadowYDistItem(200));
@@ -556,8 +554,6 @@ void SdDrawDocument::CreateDefaultCellStyles()
pSheet->SetHelpId( aHelpFile, HID_SD_CELL_STYLE_DEFAULT );
SfxItemSet& rISet = pSheet->GetItemSet();
- String aNullStr;
-
Color aNullCol(RGB_Color(COL_BLACK));
XDash aNullDash;
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index cfe6c82a54bc..4b48d1ff45ad 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -475,7 +475,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
pSheet->SetParent(String());
SfxItemSet& rBackgroundObjectsSet = pSheet->GetItemSet();
rBackgroundObjectsSet.Put(SdrShadowItem(sal_False));
- rBackgroundObjectsSet.Put(SdrShadowColorItem(String(), Color(COL_GRAY)));
+ rBackgroundObjectsSet.Put(SdrShadowColorItem(Color(COL_GRAY)));
rBackgroundObjectsSet.Put(SdrShadowXDistItem(200)); // 3 mm Schattendistanz
rBackgroundObjectsSet.Put(SdrShadowYDistItem(200));
// #i16874# enable kerning by default but only for new documents
diff --git a/svx/inc/svx/sdshcitm.hxx b/svx/inc/svx/sdshcitm.hxx
index 31513480fd15..f399a069ee61 100644
--- a/svx/inc/svx/sdshcitm.hxx
+++ b/svx/inc/svx/sdshcitm.hxx
@@ -25,11 +25,8 @@
class SdrShadowColorItem: public XColorItem
{
public:
- SdrShadowColorItem()
- {
- }
- SdrShadowColorItem(const String& rName, const Color& rTheColor)
- : XColorItem(SDRATTR_SHADOWCOLOR, rName, rTheColor)
+ SdrShadowColorItem(const Color& rTheColor)
+ : XColorItem(SDRATTR_SHADOWCOLOR, rTheColor)
{
}
};
diff --git a/svx/inc/svx/xcolit.hxx b/svx/inc/svx/xcolit.hxx
index fa56a2844092..461c2b38af7e 100644
--- a/svx/inc/svx/xcolit.hxx
+++ b/svx/inc/svx/xcolit.hxx
@@ -42,6 +42,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ XColorItem(sal_uInt16 nWhich, const Color& rTheColor);
XColorItem(sal_uInt16 nWhich, const String& rName, const Color& rTheColor);
XColorItem(sal_uInt16 nWhich, SvStream& rIn);
XColorItem(const XColorItem& rItem);
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 534ffc6cf8c2..fe533855537f 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -95,7 +95,7 @@ SdrItemPool::SdrItemPool(
// init own PoolDefaults
mppLocalPoolDefaults[SDRATTR_SHADOW -SDRATTR_START]=new SdrShadowItem;
- mppLocalPoolDefaults[SDRATTR_SHADOWCOLOR -SDRATTR_START]=new SdrShadowColorItem(OUString(),aNullCol);
+ mppLocalPoolDefaults[SDRATTR_SHADOWCOLOR -SDRATTR_START]=new SdrShadowColorItem(aNullCol);
mppLocalPoolDefaults[SDRATTR_SHADOWXDIST -SDRATTR_START]=new SdrShadowXDistItem;
mppLocalPoolDefaults[SDRATTR_SHADOWYDIST -SDRATTR_START]=new SdrShadowYDistItem;
mppLocalPoolDefaults[SDRATTR_SHADOWTRANSPARENCE-SDRATTR_START]=new SdrShadowTransparenceItem;
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 561f29514c7c..06515876bda8 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -336,6 +336,12 @@ XColorItem::XColorItem(sal_uInt16 _nWhich, const XubString& rName, const Color&
{
}
+XColorItem::XColorItem(sal_uInt16 _nWhich, const Color& rTheColor)
+ : NameOrIndex(_nWhich, OUString())
+ , aColor(rTheColor)
+{
+}
+
/*************************************************************************
|*
|* XColorItem::XColorItem(const XColorItem& rItem)