From b97726f4b66aa85db8cb2ab27b8413066930cf4f Mon Sep 17 00:00:00 2001 From: Christian Lippka ORACLE Date: Tue, 6 Dec 2011 03:27:48 +0100 Subject: impress210: #i117133# put new drawing layer fill and stroke styles in pool only for newly created documents # HG changeset patch # User Christian Lippka ORACLE # Date 1299763312 -3600 # Node ID 6b1140cdac81a77836e5be80033f328a0956c94a # Parent 8edc33ef50a3b6ebbc4e88d574b6b1ba57b1dbaa impress210: #i117133# put new drawing layer fill and stroke styles in pool only for newly created documents --- svx/source/svdraw/svdmodel.cxx | 15 +++++++++++++++ svx/source/xoutdev/xpool.cxx | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'svx/source') diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 20f19d5427be..b387f4c14a69 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -74,6 +74,9 @@ #include "svx/svdstr.hrc" // object's name #include "svdoutlinercache.hxx" +#include "svx/xflclit.hxx" +#include "svx/xflhtit.hxx" +#include "svx/xlnclit.hxx" #include #include "editeng/fontitem.hxx" @@ -2054,6 +2057,18 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelImpleme return theSdrModelUnoTunnelImplementationId::get().getSeq(); } +void SdrModel::SetDrawingLayerPoolDefaults() +{ + const String aNullStr; + const Color aNullLineCol(COL_DEFAULT_SHAPE_STROKE); + const Color aNullFillCol(COL_DEFAULT_SHAPE_FILLING); + const XHatch aNullHatch(aNullLineCol); + + pItemPool->SetPoolDefaultItem( XFillColorItem(aNullStr,aNullFillCol) ); + pItemPool->SetPoolDefaultItem( XFillHatchItem(pItemPool,aNullHatch) ); + pItemPool->SetPoolDefaultItem( XLineColorItem(aNullStr,aNullLineCol) ); +} + //////////////////////////////////////////////////////////////////////////////////////////////////// TYPEINIT1(SdrHint,SfxHint); diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index 25a04473b4c2..343408302313 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -51,8 +51,8 @@ XOutdevItemPool::XOutdevItemPool( const XubString aNullStr; const Bitmap aNullBmp; const basegfx::B2DPolyPolygon aNullPol; - const Color aNullLineCol(RGB_Color(COL_DEFAULT_SHAPE_STROKE)); - const Color aNullFillCol(RGB_Color(COL_DEFAULT_SHAPE_FILLING)); + const Color aNullLineCol(RGB_Color(COL_BLACK)); + const Color aNullFillCol(RGB_COLORDATA( 153, 204, 255 )); const Color aNullShadowCol(RGB_Color(COL_LIGHTGRAY)); const XDash aNullDash; const XGradient aNullGrad(aNullLineCol, RGB_Color(COL_WHITE)); -- cgit