recreated tag OOO_BUILD_3_2_98_1 which had these commits:

commit 79a72f2305cadc82947c92ba4fbba3fe5536b9ae (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date:   Wed Sep 15 19:03:23 2010 +0200

Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1  (3.3-alpha1)

commit da0499fda565b1f105c96b3a386670c0ad0a2c2b
Merge: 5eb7688 2ee0e40
Author: Jan Holesovsky <kendy@suse.cz>
Date:   Wed Sep 8 11:33:59 2010 +0200

Merge commit 'ooo/OOO330_m7'

commit 2ee0e40b14191b4933e87cd85cee82d9ace2c800 (tag: refs/tags/ooo/OOO330_m7)
Merge: 4022fd7 f391dff
Author: Kurt Zenker <kz@openoffice.org>
Date:   Fri Sep 3 14:39:55 2010 +0200

CWS-TOOLING: integrate CWS fs33a

commit f391dff52596dca6d1944f115a8e166ccea48f1f
Author: Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
Date:   Thu Sep 2 10:54:17 2010 +0200

fs33a: #i113583# use the categorie column as well to build table

.../source/filter/xml/xmlExportDocumentHandler.cxx |   14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)

commit 9bac46bf7bebcadfdbf4ee03a1e64650c950e036
Author: Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
Date:   Wed Sep 1 13:09:46 2010 +0200

dba33h: #i114246# use correct table name

dbaccess/source/core/api/KeySet.cxx |   31 +++++++++++++++++++++++++------
dbaccess/source/core/api/KeySet.hxx |    1 -
2 files changed, 25 insertions(+), 7 deletions(-)

commit bf76cc893df69ecb3408e4fcf1321c171a039c57
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date:   Fri Aug 27 13:19:56 2010 +0200

fs33a: reverting the fix for i112671. No string changes allowed in this phase.

.../source/ext/macromigration/macromigration.src   |    2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

commit 5521d0e17eccd263a154ad11066f07e1575eb806
Author: Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
Date:   Tue Aug 24 15:36:19 2010 +0200

fs33a: #i113631# use m_sUpdateTableName

dbaccess/source/core/api/KeySet.cxx |   16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)

commit 8fe8d81132d3b307e318afc1720dafe4b8fc8b3f
Author: Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
Date:   Tue Aug 24 15:00:36 2010 +0200

fs33a: #i113744# check length of value

dbaccess/source/core/api/KeySet.cxx |    2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

commit 54b57355495353aadd18c1846dec503c3d474b05
Author: Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
Date:   Tue Aug 24 14:32:12 2010 +0200

fs33a: #i113583# handle column names from complex descriptions

.../source/core/dataaccess/documentdefinition.cxx  |   17 ++--
dbaccess/source/core/inc/DatabaseDataProvider.hxx  |   27 +++++-
dbaccess/source/core/misc/DatabaseDataProvider.cxx |   95 ++++++++++++++++++--
.../source/filter/xml/xmlExportDocumentHandler.cxx |   28 +++++-
4 files changed, 143 insertions(+), 24 deletions(-)

commit adaa62d63307602bfb940d42a8ad7d960d3fc0b2
Merge: 2fbec17 4022fd7
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date:   Tue Aug 10 14:53:21 2010 +0200

merging in latest changes from OOO330(m3)

commit 2fbec17c655c59232ba4b9f3ea3665507ba99d53
Merge: 8c9b117 5c75695
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date:   Tue Jul 6 15:24:32 2010 +0200

Automated merge with ssh://hg@hg.services.openoffice.org/cws/unoawt2

commit 5c756956da3e5b218f63022430527bc3780afbcf
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date:   Wed Jun 23 13:31:43 2010 +0200

fs33a: #i112617# fixed typo (thanks sophie)

.../source/ext/macromigration/macromigration.src   |    2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

1 files changed, 134 insertions, 134 deletions

diff --git a/reportdesign/source/inc/stringconstants.hrc b/reportdesign/source/inc/stringconstants.hrc
index a84d299901da..46ed96fdb961 100644
--- a/reportdesign/source/inc/stringconstants.hrc
+++ b/reportdesign/source/inc/stringconstants.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,101 +56,101 @@ DECLARE_CONSTASCII_USTRING(SERVICE_OLEOBJECT);
 //= property names
 //============================================================
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_VISIBLE         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_NAME            );
-DECLARE_CONSTASCII_USTRING(PROPERTY_HEIGHT          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BACKCOLOR       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BACKTRANSPARENT );
+DECLARE_CONSTASCII_USTRING(PROPERTY_VISIBLE			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_NAME			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_HEIGHT			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_BACKCOLOR		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_BACKTRANSPARENT	);
 DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUND);
 DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUNDTRANSPARENT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FORCENEWPAGE    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_NEWROWORCOL     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_KEEPTOGETHER    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CANGROW         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CANSHRINK       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_REPEATSECTION   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_GROUP           );
+DECLARE_CONSTASCII_USTRING(PROPERTY_FORCENEWPAGE	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_NEWROWORCOL		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_KEEPTOGETHER	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CANGROW			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CANSHRINK		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_REPEATSECTION	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_GROUP			);
 DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTDEFINITION);
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_HEADER          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FOOTER          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPINTERVAL   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_EXPRESSION      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPON         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_SORTASCENDING   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPS          );
+DECLARE_CONSTASCII_USTRING(PROPERTY_HEADER			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_FOOTER			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPINTERVAL	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_EXPRESSION		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPON			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_SORTASCENDING	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPS			);
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_MASTERFIELDS        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_DETAILFIELDS        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTHEADER        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTFOOTER        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADER          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTER          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_DETAIL              );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CAPTION             );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICURL      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_COMMAND             );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICLOCATION );
-DECLARE_CONSTASCII_USTRING(PROPERTY_ORIENTATION         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAPERFORMAT         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAPERSIZE           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPKEEPTOGETHER   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADEROPTION    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTEROPTION    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_COMMANDTYPE         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTHEADERON      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTFOOTERON      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADERON        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTERON        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_HEADERON            );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FOOTERON            );
-DECLARE_CONSTASCII_USTRING(PROPERTY_WIDTH               );
-DECLARE_CONSTASCII_USTRING(PROPERTY_POSITIONX           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_POSITIONY           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATAFIELD           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PARAADJUST              );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTOR      );
+DECLARE_CONSTASCII_USTRING(PROPERTY_MASTERFIELDS		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_DETAILFIELDS		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTHEADER		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTFOOTER		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADER			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTER			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_DETAIL				);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CAPTION				);
+DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICURL		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_COMMAND				);
+DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICLOCATION	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_ORIENTATION			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_PAPERFORMAT			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_PAPERSIZE			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPKEEPTOGETHER	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADEROPTION	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTEROPTION	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_COMMANDTYPE			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTHEADERON		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTFOOTERON		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADERON		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTERON		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_HEADERON			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_FOOTERON			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_WIDTH				);
+DECLARE_CONSTASCII_USTRING(PROPERTY_POSITIONX			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_POSITIONY			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_DATAFIELD			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_PARAADJUST				);
+DECLARE_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTOR		);
 DECLARE_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORASIAN );
 DECLARE_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORCOMPLEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLTEXTEMPHASISMARK );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARRELIEF          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARCOLOR           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_VERTICALALIGN       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_IMAGEPOSITION       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_IMAGEURL            );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOLOR  );
-DECLARE_CONSTASCII_USTRING(PROPERTY_LABEL               );
-DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEDEFAULT    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMAX        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMIN        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEY           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_MAXTEXTLEN          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCE          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATSSUPPLIER     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBORDER       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBORDERCOLOR  );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BORDER              );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BORDERCOLOR         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL      );
+DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLTEXTEMPHASISMARK	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHARRELIEF			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHARCOLOR			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_VERTICALALIGN		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_IMAGEPOSITION		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_IMAGEURL			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOLOR	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_LABEL				);
+DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEDEFAULT	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMAX		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMIN		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEY			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_MAXTEXTLEN			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCE			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATSSUPPLIER		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBORDER		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBORDERCOLOR	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_BORDER				);
+DECLARE_CONSTASCII_USTRING(PROPERTY_BORDERCOLOR			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL		);
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_LEFTMARGIN          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_RIGHTMARGIN         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TOPMARGIN           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BOTTOMMARGIN        );
+DECLARE_CONSTASCII_USTRING(PROPERTY_LEFTMARGIN			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_RIGHTMARGIN			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_TOPMARGIN			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_BOTTOMMARGIN		);
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_PRINTREPEATEDVALUES );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONDITIONALPRINTEXPRESSION  );
-DECLARE_CONSTASCII_USTRING(PROPERTY_STARTNEWCOLUMN          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_STARTNEWPAGE            );
-DECLARE_CONSTASCII_USTRING(PROPERTY_RESETPAGENUMBER         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_MINHEIGHTNEWPAGE        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_SHAPE                   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PRINTWHENGROUPCHANGE        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_STATE   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TIME_STATE  );
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATE_STATE  );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TRISTATE    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCETYPE  );
+DECLARE_CONSTASCII_USTRING(PROPERTY_PRINTREPEATEDVALUES	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CONDITIONALPRINTEXPRESSION	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_STARTNEWCOLUMN			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_STARTNEWPAGE			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_RESETPAGENUMBER			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_MINHEIGHTNEWPAGE		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_SHAPE					);
+DECLARE_CONSTASCII_USTRING(PROPERTY_PRINTWHENGROUPCHANGE		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_STATE	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_TIME_STATE	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_DATE_STATE	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_TRISTATE	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCETYPE	);
 DECLARE_CONSTASCII_USTRING(PROPERTY_FONTCHARWIDTH);
 DECLARE_CONSTASCII_USTRING(PROPERTY_FONTCHARSET);
 DECLARE_CONSTASCII_USTRING(PROPERTY_FONTFAMILY);
@@ -171,21 +171,21 @@ DECLARE_CONSTASCII_USTRING(PROPERTY_FONTWIDTH);
 DECLARE_CONSTASCII_USTRING(PROPERTY_FONTWORDLINEMODE);
 DECLARE_CONSTASCII_USTRING(PROPERTY_FONTTYPE);
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_ENABLED     );
+DECLARE_CONSTASCII_USTRING(PROPERTY_ENABLED		);
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHAREMPHASIS        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTNAME        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAME   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILY      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSET     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCH       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARHEIGHT          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINE       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWEIGHT          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARPOSTURE         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWORDMODE        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARROTATION        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTH      );
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHAREMPHASIS		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTNAME		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAME	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILY		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSET		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCH		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHARHEIGHT			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINE		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWEIGHT			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHARPOSTURE			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWORDMODE		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHARROTATION		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTH		);
 
 DECLARE_CONSTASCII_USTRING(PROPERTY_CHAREMPHASISASIAN);
 DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTNAMEASIAN);
@@ -217,46 +217,46 @@ DECLARE_CONSTASCII_USTRING(PROPERTY_CHARROTATIONCOMPLEX);
 DECLARE_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTHCOMPLEX);
 DECLARE_CONSTASCII_USTRING(PROPERTY_CHARLOCALECOMPLEX   );
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_STATUSINDICATOR     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_SECTION             );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FILTER              );
-DECLARE_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING    );
+DECLARE_CONSTASCII_USTRING(PROPERTY_STATUSINDICATOR		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_SECTION				);
+DECLARE_CONSTASCII_USTRING(PROPERTY_FILTER				);
+DECLARE_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING	);
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_MULTILINE           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FORMULA             );
-DECLARE_CONSTASCII_USTRING(PROPERTY_INITIALFORMULA      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PREEVALUATED        );
-DECLARE_CONSTASCII_USTRING(PROPERTY_DEEPTRAVERSING      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_MIMETYPE            );
-DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGROUNDCOLOR     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TEXT                );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTRELIEF          );
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTEMPHASISMARK    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_ZORDER              );
-DECLARE_CONSTASCII_USTRING(PROPERTY_OPAQUE              );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TRANSFORMATION      );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEENGINE   );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEDATA     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEGEOMETRY );
+DECLARE_CONSTASCII_USTRING(PROPERTY_MULTILINE			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME  	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_FORMULA				);
+DECLARE_CONSTASCII_USTRING(PROPERTY_INITIALFORMULA		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_PREEVALUATED		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_DEEPTRAVERSING		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_MIMETYPE			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGROUNDCOLOR		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_TEXT        		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_FONTRELIEF			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_FONTEMPHASISMARK	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_ZORDER				);
+DECLARE_CONSTASCII_USTRING(PROPERTY_OPAQUE				);
+DECLARE_CONSTASCII_USTRING(PROPERTY_TRANSFORMATION		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEENGINE	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEDATA		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEGEOMETRY	);
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_NUMBERINGTYPE       );
-DECLARE_CONSTASCII_USTRING(PROPERTY_PAGESTYLELAYOUT     );
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISLANDSCAPE         );
-DECLARE_CONSTASCII_USTRING(PROPERTY_ALIGN               );
-DECLARE_CONSTASCII_USTRING(PROPERTY_TYPE                );
+DECLARE_CONSTASCII_USTRING(PROPERTY_NUMBERINGTYPE		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_PAGESTYLELAYOUT		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_ISLANDSCAPE			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_ALIGN   			);
+DECLARE_CONSTASCII_USTRING(PROPERTY_TYPE       			);
 
 DECLARE_CONSTASCII_USTRING(PROPERTY_PRESERVEIRI         );
 DECLARE_CONSTASCII_USTRING(PROPERTY_SCALEMODE           );
 
-DECLARE_CONSTASCII_USTRING(PROPERTY_LINESTYLE           );
-DECLARE_CONSTASCII_USTRING(PROPERTY_LINEDASH            );
-DECLARE_CONSTASCII_USTRING(PROPERTY_LINECOLOR           );
+DECLARE_CONSTASCII_USTRING(PROPERTY_LINESTYLE       	);
+DECLARE_CONSTASCII_USTRING(PROPERTY_LINEDASH       		);
+DECLARE_CONSTASCII_USTRING(PROPERTY_LINECOLOR       	);
 DECLARE_CONSTASCII_USTRING(PROPERTY_LINETRANSPARENCE    );
-DECLARE_CONSTASCII_USTRING(PROPERTY_LINEWIDTH           );
+DECLARE_CONSTASCII_USTRING(PROPERTY_LINEWIDTH       	);
 
 DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFLASH           );
 DECLARE_CONSTASCII_USTRING(PROPERTY_CHARAUTOKERNING     );