diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 10:54:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 10:54:45 +0000 |
| commit | 6fa7a3be36a992a434aba66170111108b51b6d18 (patch) | |
| tree | b6dccd8d30721760ff09bc008a8d2a12cd0d2b98 /sw/source/ui/inc/cfgitems.hxx | |
| parent | INTEGRATION: CWS swwarnings (1.5.710); FILE MERGED (diff) | |
| download | core-6fa7a3be36a992a434aba66170111108b51b6d18.tar.gz core-6fa7a3be36a992a434aba66170111108b51b6d18.zip | |
INTEGRATION: CWS swwarnings (1.13.242); FILE MERGED
2007/04/11 10:49:59 os 1.13.242.3: RESYNC: (1.13-1.14); FILE MERGED
2007/03/05 12:45:44 tl 1.13.242.2: #i69287# warning-free code
2007/02/27 13:07:08 tl 1.13.242.1: #i69287# warning-free code
Diffstat (limited to 'sw/source/ui/inc/cfgitems.hxx')
| -rw-r--r-- | sw/source/ui/inc/cfgitems.hxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx index f4252dc41b97..7ffa871f5189 100644 --- a/sw/source/ui/inc/cfgitems.hxx +++ b/sw/source/ui/inc/cfgitems.hxx @@ -4,9 +4,9 @@ * * $RCSfile: cfgitems.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2007-04-03 13:48:28 $ + * last change: $Author: hr $ $Date: 2007-09-27 11:54:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -34,6 +34,9 @@ ************************************************************************/ #ifndef _CFGITEMS_HXX #define _CFGITEMS_HXX + +#include <tools/color.hxx> + #ifndef _SFXPOOLITEM_HXX //autogen #include <svtools/poolitem.hxx> #endif @@ -45,6 +48,8 @@ #include <printdata.hxx> #endif +#include <cmdid.h> + class SwWriterApp; class SwModule; #ifndef PRODUCT @@ -153,6 +158,8 @@ public: SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + + using SwPrintData::operator ==; virtual int operator==( const SfxPoolItem& ) const; const rtl::OUString &GetFax() const { return sFaxName; } @@ -231,8 +238,8 @@ class SW_DLLPUBLIC SwTestItem : public SfxPoolItem BOOL bTest10:1; public: - SwTestItem( USHORT nWhich): - SfxPoolItem(nWhich){}; + SwTestItem( USHORT _nWhich): + SfxPoolItem(_nWhich){}; SwTestItem( const SwTestItem& pTestItem); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; |