diff options
| author | Christian Lippka ORACLE <christian.lippka@oracle.com> | 2011-12-06 03:27:48 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2011-12-06 09:39:12 +0100 |
| commit | b97726f4b66aa85db8cb2ab27b8413066930cf4f (patch) | |
| tree | d7b876c4055f632abf07364b40f48579f3f632fa /svx | |
| parent | f0a1b95f99bed6d184e3020b5c7e30bc6c1597f6 (diff) | |
impress210: #i117133# put new drawing layer fill and stroke styles in pool only for newly created documents
# HG changeset patch
# User Christian Lippka ORACLE <christian.lippka@oracle.com>
# 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
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svx/svdmodel.hxx | 1 | ||||
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 15 | ||||
| -rw-r--r-- | svx/source/xoutdev/xpool.cxx | 4 |
3 files changed, 18 insertions, 2 deletions
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 567c821e5f4e..2b74913f2d99 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -693,6 +693,7 @@ public: also during the runtime of the Undo() and Redo() methods. */ bool IsUndoEnabled() const; + void SetDrawingLayerPoolDefaults(); }; typedef tools::WeakReference< SdrModel > SdrModelWeakRef; 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 <svl/asiancfg.hxx> #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)); |