diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 06:59:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 06:59:45 +0000 |
| commit | 9514d6d24f637be9c365c625ab7c767045d9687a (patch) | |
| tree | 883010274b870a66b3a6f2b33f2bd184db4bb5fd /sw/inc/docsh.hxx | |
| parent | 0a651c55a87da56d60966ec7148ba5b80a7257ae (diff) | |
INTEGRATION: CWS swwarnings (1.38.100); FILE MERGED
2007/08/20 15:15:15 tl 1.38.100.4: RESYNC: (1.40-1.41); FILE MERGED
2007/05/29 10:39:19 os 1.38.100.3: RESYNC: (1.38-1.40); FILE MERGED
2007/03/05 12:43:15 tl 1.38.100.2: #i69287# warning-free code
2007/02/22 15:05:36 tl 1.38.100.1: #i69287# warning-free code
Diffstat (limited to 'sw/inc/docsh.hxx')
| -rw-r--r-- | sw/inc/docsh.hxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 306ccdd0f69e..498e1e8c5315 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -4,9 +4,9 @@ * * $RCSfile: docsh.hxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: obo $ $Date: 2007-07-17 13:05:08 $ + * last change: $Author: hr $ $Date: 2007-09-27 07:59:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -153,6 +153,8 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener public: + using SotObject::GetInterface; + // aber selbst implementieren SFX_DECL_INTERFACE(SW_DOCSHELL) SFX_DECL_OBJECTFACTORY() @@ -170,6 +172,7 @@ public: // OLE-Geraffel virtual void SetVisArea( const Rectangle &rRect ); + using SfxObjectShell::GetVisArea; virtual Rectangle GetVisArea( USHORT nAspect ) const; virtual Printer *GetDocumentPrinter(); virtual OutputDevice* GetDocumentRefDev(); @@ -218,6 +221,7 @@ public: USHORT nIdx2 = INDEX_IGNORE, USHORT nIdx3 = INDEX_IGNORE); + using SfxObjectShell::GetStyleFamilyBitmap; virtual Bitmap GetStyleFamilyBitmap( SfxStyleFamily eFamily, BmpColorMode eColorMode ); // View setzen fuer Aktionen ueber Shell |