diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 11:06:42 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 11:06:42 +0000 |
commit | c1bcdfb3ae8dc1dfdc92725f88e964592ab7955e (patch) | |
tree | a0d10beaf586e5930bdffeaa7cb91c0f938f5947 /sw/source/ui/inc/optpage.hxx | |
parent | INTEGRATION: CWS swwarnings (1.4.710); FILE MERGED (diff) | |
download | core-c1bcdfb3ae8dc1dfdc92725f88e964592ab7955e.tar.gz core-c1bcdfb3ae8dc1dfdc92725f88e964592ab7955e.zip |
INTEGRATION: CWS swwarnings (1.19.586); FILE MERGED
2007/04/13 12:18:03 tl 1.19.586.3: #i69287# binfilter related comments removed
2007/04/11 10:50:07 os 1.19.586.2: RESYNC: (1.19-1.20); FILE MERGED
2007/03/05 12:45:47 tl 1.19.586.1: #i69287# warning-free code
Diffstat (limited to 'sw/source/ui/inc/optpage.hxx')
-rw-r--r-- | sw/source/ui/inc/optpage.hxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index 3fc3ea4d54ce..9654405de8ab 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -4,9 +4,9 @@ * * $RCSfile: optpage.hxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: rt $ $Date: 2007-04-03 13:48:38 $ + * last change: $Author: hr $ $Date: 2007-09-27 12:06:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -184,7 +184,7 @@ public: void SetFax( const SvStringsDtor& ); void SelectFax( const String& ); void SetPreview(BOOL bPrev); - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); }; @@ -273,7 +273,7 @@ public: virtual void Reset( const SfxItemSet& rSet ); void SetFontMode(sal_uInt8 nGroup) {nFontGroup = nGroup;} - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); }; /*-----------------18.01.97 12.10------------------- @@ -335,7 +335,7 @@ public: virtual void Reset( const SfxItemSet& rSet ); void SetWrtShell(SwWrtShell* pSh) {pWrtShell = pSh;} - virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 + virtual void PageCreated (SfxAllItemSet aSet); }; /*-----------------31.10.97 17:55------------------- @@ -400,7 +400,9 @@ class SwMarkPreview : public Window USHORT nMarkPos; + using OutputDevice::DrawRect; void DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor); + void Paint(const Rectangle&); void PaintPage(const Rectangle &rRect); void InitColors( void ); |