diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 12:26:44 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 12:26:44 +0000 |
| commit | 33ae0fc857b6245b68ea2bce52814d4dc38675f5 (patch) | |
| tree | 0c77b81c590bb50aaa8ff18587084ada7139bae0 /svx/source/gallery2 | |
| parent | 4fa35ed279732674cf6d812fa0764a5d83c4b683 (diff) | |
INTEGRATION: CWS aw024 (1.18.20); FILE MERGED
2006/11/10 03:31:18 aw 1.18.20.8: RESYNC: (1.22-1.23); FILE MERGED
2006/09/21 19:02:49 aw 1.18.20.7: RESYNC: (1.21-1.22); FILE MERGED
2006/07/04 12:49:52 aw 1.18.20.6: RESYNC: (1.20-1.21); FILE MERGED
2005/11/18 16:55:47 aw 1.18.20.5: RESYNC: (1.19-1.20); FILE MERGED
2005/09/18 04:03:27 aw 1.18.20.4: RESYNC: (1.18-1.19); FILE MERGED
2005/05/19 12:31:20 aw 1.18.20.3: #i39529#
2005/05/12 16:39:26 aw 1.18.20.2: #i39529#
2005/04/26 15:04:16 aw 1.18.20.1: #i39528#
Diffstat (limited to 'svx/source/gallery2')
| -rw-r--r-- | svx/source/gallery2/galobj.cxx | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 6a7088c078d8..75f5cc4ca275 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -4,9 +4,9 @@ * * $RCSfile: galobj.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: obo $ $Date: 2006-10-12 12:49:07 $ + * last change: $Author: ihi $ $Date: 2006-11-14 13:26:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,6 +49,14 @@ #include "galmisc.hxx" #include "galobj.hxx" +#ifndef _SV_SALBTYPE_HXX +#include <vcl/salbtype.hxx> // FRound +#endif + +#ifndef _SV_SVAPP_HXX +#include <vcl/svapp.hxx> +#endif + // ------------- // - SgaObject - // ------------- @@ -534,7 +542,8 @@ BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rMode pOut->Push(); pOut->SetMapMode( aMap ); - aView.ShowPage( const_cast< FmFormPage* >( pPage ), Point() ); + aView.ShowSdrPage( const_cast< FmFormPage* >( pPage )); +// aView.ShowSdrPage( const_cast< FmFormPage* >( pPage ), Point() ); aView.CompleteRedraw( pOut, Rectangle( pOut->PixelToLogic( Point() ), pOut->GetOutputSize() ) ); pOut->Pop(); |