diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-21 15:57:19 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-21 15:57:19 +0000 |
| commit | b74aa84669a3e688ec5fa15a5cf287f0524220ab (patch) | |
| tree | 8d79b33b6d81d283f6523b92dee252a7b6f401d5 /svx/source/unodraw | |
| parent | c0a201f3d6561e1ef675905aaa21849ca53d4376 (diff) | |
INTEGRATION: CWS aw036 (1.147.48); FILE MERGED
2006/10/20 12:58:46 aw 1.147.48.1: #i68523# special handling for lathe and extrude 3d shapes in setAllPropertiesToDefault()
Diffstat (limited to 'svx/source/unodraw')
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 0135d84ff23e..27417b22339b 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unoshape.cxx,v $ * - * $Revision: 1.150 $ + * $Revision: 1.151 $ * - * last change: $Author: ihi $ $Date: 2006-11-14 13:54:59 $ + * last change: $Author: vg $ $Date: 2006-11-21 16:57:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -191,6 +191,14 @@ #include <vector> +// #i68523# +#ifndef _E3D_LATHE3D_HXX +#include "lathe3d.hxx" +#endif +#ifndef _E3D_EXTRUD3D_HXX +#include "extrud3d.hxx" +#endif + #include <comphelper/scopeguard.hxx> #include <boost/bind.hpp> @@ -3165,12 +3173,24 @@ void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException) if( !mpObj.is() ) throw lang::DisposedException(); mpObj->ClearMergedItem(); // nWhich == 0 => all - if (mpObj->ISA( SdrGrafObj )) + + if(mpObj->ISA(SdrGrafObj)) { // defaults for graphic objects have changed: mpObj->SetMergedItem( XFillStyleItem( XFILL_NONE ) ); mpObj->SetMergedItem( XLineStyleItem( XLINE_NONE ) ); } + + // #i68523# special handling for Svx3DCharacterModeItem, this is not saved + // but needs to be TRUE in svx, pool default (false) in sch. Since sch + // does not load lathe or extrude objects, it is possible to set the items + // here. + // For other solution possibilities, see task description. + if(mpObj->ISA(E3dLatheObj) || mpObj->ISA(E3dExtrudeObj)) + { + mpObj->SetMergedItem(Svx3DCharacterModeItem(true)); + } + mpModel->SetChanged(); } |