diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-10-19 11:27:55 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-10-19 11:27:55 +0000 |
| commit | 21d6304d725f00308f3fbca348ccac3648de612a (patch) | |
| tree | d1e783569cdcffcdb74b26a3d5e3ee978136c280 /sd/source/ui/unoidl/unopage.hxx | |
| parent | 488cf1910f478631a7fc32a63ff256dc5016dac1 (diff) | |
INTEGRATION: CWS cov2src (1.13.34); FILE MERGED
2005/10/18 12:38:45 rt 1.13.34.1: #126234# Join MWS COV680 m4 into SRC680
Diffstat (limited to 'sd/source/ui/unoidl/unopage.hxx')
| -rw-r--r-- | sd/source/ui/unoidl/unopage.hxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index d229678f04bd..7027d1af11c6 100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -4,9 +4,9 @@ * * $RCSfile: unopage.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2005-09-09 06:53:03 $ + * last change: $Author: rt $ $Date: 2005-10-19 12:27:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -95,12 +95,14 @@ class SdGenericDrawPage : public SvxFmDrawPage, public ::com::sun::star::animations::XAnimationNodeSupplier, public ::com::sun::star::document::XLinkTargetSupplier { +private: + SdXImpressDocument* mpModel; + SdrModel* mpSdrModel; + protected: friend class SdXImpressDocument; SvxItemPropertySet maPropSet; - SdXImpressDocument* mpModel; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxModel; virtual void setBackground( const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); virtual void getBackground( ::com::sun::star::uno::Any& rValue ) throw(); @@ -117,19 +119,22 @@ protected: void SetHeight( sal_Int32 nHeight ); sal_Bool mbHasBackgroundObject; + bool mbIsImpressDocument; virtual void disposing() throw(); + void throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException ); + public: SdGenericDrawPage( SdXImpressDocument* pModel, SdPage* pInPage, const SfxItemPropertyMap* pMap ) throw(); virtual ~SdGenericDrawPage() throw(); // intern - void Invalidate() { pPage = NULL; mpModel = NULL; mxModel = NULL; } + void Invalidate() { pPage = NULL; mpModel = NULL; } sal_Bool isValid() { return (pPage != NULL) && (mpModel != NULL); } SdPage* GetPage() const { return (SdPage*)pPage; } - SdXImpressDocument* GetModel() const { return mpModel; } + SdXImpressDocument* GetModel() const; UNO3_GETIMPLEMENTATION_DECL( SdGenericDrawPage ) |