diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 14:55:36 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 14:55:36 +0000 |
commit | f7a9b6b5c3794f6a21684cb6e9ebccf5faee2e30 (patch) | |
tree | 012a964d62ff1f78cc219c7f2f4404ea5301d8a8 /sd/inc | |
parent | a2121084269dc4a2745e926d416d2ec54a4bdf06 (diff) |
CWS-TOOLING: integrate CWS impress163_DEV300
Diffstat (limited to 'sd/inc')
-rw-r--r-- | sd/inc/drawdoc.hxx | 4 | ||||
-rw-r--r-- | sd/inc/stlpool.hxx | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index c9bbe818b5a0..33dedd794879 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -266,6 +266,10 @@ public: void InsertPage(SdrPage* pPage, USHORT nPos=0xFFFF); void DeletePage(USHORT nPgNum); SdrPage* RemovePage(USHORT nPgNum); + + virtual void InsertMasterPage(SdrPage* pPage, USHORT nPos=0xFFFF); + virtual SdrPage* RemoveMasterPage(USHORT nPgNum); + void RemoveUnnessesaryMasterPages( SdPage* pMaster=NULL, BOOL bOnlyDuplicatePages=FALSE, BOOL bUndo=TRUE ); SD_DLLPUBLIC void SetMasterPage(USHORT nSdPageNum, const String& rLayoutName, SdDrawDocument* pSourceDoc, BOOL bMaster, BOOL bCheckMasters); diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index d4a2d192cadc..a924c5d8a995 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -61,6 +61,7 @@ typedef ::cppu::ImplInheritanceHelper4< SfxStyleSheetPool, class SdStyleSheetPool : public SdStyleSheetPoolBase, public SfxListener { + friend class SdDrawDocument; public: SdStyleSheetPool(SfxItemPool const& rPool, SdDrawDocument* pDocument); @@ -135,8 +136,6 @@ protected: using SfxStyleSheetPool::Create; virtual ~SdStyleSheetPool(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - void AddStyleFamily( const SdPage* pPage ); void RemoveStyleFamily( const SdPage* pPage ); |