diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 12:33:33 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 12:33:33 +0000 |
commit | 3ed7eb02a190852014d7bd9bdf7f8979aab2c911 (patch) | |
tree | 9ea4b4bae3977c3ab8f65f5ea0088a43945ea870 /svtools/source | |
parent | 1013dbd123d46e4b2c5876d9391fc99b2416e37e (diff) |
INTEGRATION: CWS impress108 (1.30.124); FILE MERGED
2006/09/26 13:32:21 sj 1.30.124.1: #i69511# fixed memory overwriting problem
Diffstat (limited to 'svtools/source')
-rw-r--r-- | svtools/source/filter.vcl/wmf/winmtf.hxx | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx index e9a57d79b11f..11c3ecafe905 100644 --- a/svtools/source/filter.vcl/wmf/winmtf.hxx +++ b/svtools/source/filter.vcl/wmf/winmtf.hxx @@ -4,9 +4,9 @@ * * $RCSfile: winmtf.hxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: hr $ $Date: 2006-06-19 21:08:37 $ + * last change: $Author: hr $ $Date: 2006-10-24 13:33:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,9 +40,13 @@ #define WIN_MTF_ASSERT #endif +#include <vector> #include <math.h> #include <stdlib.h> #include <sot/object.hxx> +#ifndef BOOST_SHARED_PTR_HPP_INCLUDED +#include <boost/shared_ptr.hpp> +#endif #ifndef _TOOL_DEBUG_HXX #include <tools/debug.hxx> #endif @@ -494,7 +498,7 @@ struct SaveStruct sal_Bool bFillStyleSelected; }; -DECLARE_STACK( SaveStack, SaveStruct* ) +typedef ::boost::shared_ptr< SaveStruct > SaveStructPtr; // ----------------------------------------------------------------------------- @@ -582,15 +586,15 @@ class WinMtfOutput RasterOp meLatestRasterOp; RasterOp meRasterOp; - GDIObj** mpGDIObj; - sal_uInt32 mnEntrys; - Point maActPos; // wird. (ist gleich TRANSPARENT oder nicht) + std::vector< GDIObj* > vGDIObj; + + Point maActPos; sal_uInt32 mnRop; sal_Bool mbNopMode; sal_Bool mbFillStyleSelected; - SaveStack maSaveStack; // Stapel fuer aktuelle Zustaende bzw. DCs (Drawing-Contexts) + std::vector< SaveStructPtr > vSaveStack; sal_uInt32 mnGfxMode; sal_uInt32 mnMapMode; |