INTEGRATION: CWS pchfix04 (1.31.4); FILE MERGED

2007/04/25 23:08:05 hjs 1.31.4.2: RESYNC: (1.31-1.32); FILE MERGED
2007/02/05 08:27:15 os 1.31.4.1: #i73604# usage of ITEMID_* removed

1 files changed, 2 insertions, 66 deletions

diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 1b5cdd7d2de1..12802311901a 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: hintids.hxx,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: kz $ $Date: 2007-02-12 14:32:32 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 15:53:40 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -426,68 +426,4 @@ extern USHORT __FAR_DATA aPgFrmFmtSetRange[];
 // check if ID is InRange of AttrSet-Ids
 BOOL IsInRange( const USHORT* pRange, const USHORT nId );
 
-
-
-#define ITEMID_FONT         RES_CHRATR_FONT
-#define ITEMID_POSTURE      RES_CHRATR_POSTURE
-#define ITEMID_WEIGHT       RES_CHRATR_WEIGHT
-#define ITEMID_SHADOWED     RES_CHRATR_SHADOWED
-#define ITEMID_AUTOKERN     RES_CHRATR_AUTOKERN
-#define ITEMID_CONTOUR      RES_CHRATR_CONTOUR
-#define ITEMID_CROSSEDOUT   RES_CHRATR_CROSSEDOUT
-#define ITEMID_UNDERLINE    RES_CHRATR_UNDERLINE
-#define ITEMID_FONTHEIGHT   RES_CHRATR_FONTSIZE
-#define ITEMID_PROPSIZE     RES_CHRATR_PROPORTIONALFONTSIZE
-#define ITEMID_COLOR        RES_CHRATR_COLOR
-#define ITEMID_CHARSETCOLOR RES_CHRATR_CHARSETCOLOR
-#define ITEMID_KERNING      RES_CHRATR_KERNING
-#define ITEMID_CASEMAP      RES_CHRATR_CASEMAP
-#define ITEMID_LANGUAGE     RES_CHRATR_LANGUAGE
-#define ITEMID_ESCAPEMENT   RES_CHRATR_ESCAPEMENT
-#define ITEMID_BLINK        RES_CHRATR_BLINK
-#define ITEMID_NOHYPHENHERE RES_CHRATR_NOHYPHEN
-#define ITEMID_NOLINEBREAK  RES_CHRATR_NOLINEBREAK
-#define ITEMID_WORDLINEMODE RES_CHRATR_WORDLINEMODE
-#define ITEMID_EMPHASISMARK RES_CHRATR_EMPHASIS_MARK
-#define ITEMID_TWOLINES     RES_CHRATR_TWO_LINES
-#define ITEMID_CHARSCALE_W  RES_CHRATR_SCALEW
-#define ITEMID_CHARROTATE   RES_CHRATR_ROTATE
-#define ITEMID_CHARRELIEF   RES_CHRATR_RELIEF
-#define ITEMID_CHARHIDDEN   RES_CHRATR_HIDDEN
-
-//Defines fuer die ehemaligen FrmAttribute, die jetzt in frmitems.hxx
-//von svx zu finden sind.
-#define ITEMID_PAPERBIN     RES_PAPER_BIN
-#define ITEMID_LRSPACE      RES_LR_SPACE
-#define ITEMID_ULSPACE      RES_UL_SPACE
-#define ITEMID_PRINT        RES_PRINT
-#define ITEMID_OPAQUE       RES_OPAQUE
-#define ITEMID_PROTECT      RES_PROTECT
-#define ITEMID_BRUSH        RES_BACKGROUND
-#define ITEMID_BOX          RES_BOX
-#define ITEMID_SHADOW       RES_SHADOW
-#define ITEMID_MACRO        RES_FRMMACRO
-#define ITEMID_FMTKEEP      RES_KEEP
-#define ITEMID_FMTBREAK     RES_BREAK
-#define ITEMID_FRAMEDIR     RES_FRAMEDIR
-
-//Defines fuer die ehemaligen ParAttribute, die jetzt in paraitem.hxx
-//bzw. tabsitem.hxx von svx zu finden sind.
-
-#define ITEMID_LINESPACING  RES_PARATR_LINESPACING
-#define ITEMID_ADJUST       RES_PARATR_ADJUST
-#define ITEMID_FMTSPLIT     RES_PARATR_SPLIT
-#define ITEMID_WIDOWS       RES_PARATR_WIDOWS
-#define ITEMID_ORPHANS      RES_PARATR_ORPHANS
-#define ITEMID_TABSTOP      RES_PARATR_TABSTOP
-#define ITEMID_HYPHENZONE   RES_PARATR_HYPHENZONE
-#define ITEMID_SCRIPTSPACE  RES_PARATR_SCRIPTSPACE
-#define ITEMID_HANGINGPUNCTUATION   RES_PARATR_HANGINGPUNCTUATION
-#define ITEMID_FORBIDDENRULE    RES_PARATR_FORBIDDEN_RULES
-#define ITEMID_PARAVERTALIGN RES_PARATR_VERTALIGN
-#define ITEMID_PARAGRID     RES_PARATR_SNAPTOGRID
-
-//Defines fuer die ehemaligen GrfAttribute, die jetzt im svx zu finden sind.
-#define ITEMID_GRF_CROP     RES_GRFATR_CROPGRF
-
 #endif