recreated tag OOO_BUILD_3_2_98_1 which had these commits:

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

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

commit 11ab1028c5e354ac40ee58ace0dc84989eae8a27
Author: Jiao Jianhua <jjiao@novell.com>
Date:   Tue Sep 14 17:14:11 2010 +0200

sw-default-cjk-fontsize.diff: default CJK font fontsize as 10.5pt

i#72010

sw/source/ui/config/fontcfg.cxx |    5 ++++-
sw/source/ui/inc/fontcfg.hxx    |    1 +
2 files changed, 5 insertions(+), 1 deletions(-)

commit 216f84e4b0933612276690a7f69f264e9ded5c71
Author: Florian Reuter <freuter@novell.com>
Date:   Tue Sep 14 17:11:44 2010 +0200

sw-graphic-save-problem.diff:

n240770

sw/source/core/graphic/ndgrf.cxx |    4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

commit 9ec22325aba338803a96a373db97f3f4e2bc2b12
Author: Michel Loiseleur <mloiseleur@linagora.com>
Date:   Tue Sep 14 17:04:28 2010 +0200

sw-html-insert-unknown-tags.diff: paste html text between 2 unknown tags

i#59064

sw/source/filter/html/swhtml.cxx |   16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)

commit 4b3a488ecb4e6810735825973bb9433249a19fb6
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date:   Tue Sep 14 16:54:36 2010 +0200

sw-paste-table.diff: Refresh the cell formatting after pasting in it

n#564789

sw/source/filter/basflt/shellio.cxx |   10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)

commit d4ad757a11eb662f853ea78fefd6d11ea1df2119
Author: Fong Lin <pflin@novell.com>
Date:   Tue Sep 14 16:42:39 2010 +0200

sw-changes-format-fix.diff: show insertion change first

n#545815

sw/source/core/doc/docredln.cxx |   21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)

commit 33370870cc133b7cb7f470f752526cdd4a4339ab
Author: Fong Lin <pflin@novell.com>
Date:   Tue Sep 14 16:39:57 2010 +0200

sw-ww8-import-list-fix.diff:fix bullet indent issue

n#547308

sw/source/filter/ww8/ww8par6.cxx |   23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)

commit 0589e7f8eb08119cee8ff1a186bfbb887d3838e4
Author: Fong Lin <pflin@novell.com>
Date:   Tue Sep 14 16:35:20 2010 +0200

sw-ww8-textframe-background-fix.diff

n#547308

sw/source/filter/ww8/ww8graf.cxx |    5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

commit b7551ace7e57ba3a4dbacf5d8906000600a43467
Author: Amelia Wang <amwang@novell.com>
Date:   Tue Sep 14 16:23:16 2010 +0200

sw-insert-pagebreak-in-numbered-paragraph.diff

n#396648

sw/inc/doc.hxx                   |    1 +
sw/source/core/docnode/ndtbl.cxx |   43 ++++++++++++++++++++++++++++++++++++++
sw/source/ui/wrtsh/wrtsh1.cxx    |    2 +
3 files changed, 46 insertions(+), 0 deletions(-)

commit edbd32ded9f6dddb75ebb57d03a10ac10d0fa107
Author: Amelia Wang <amwang@novell.com>
Date:   Tue Sep 14 16:20:45 2010 +0200

sw-outline-numbering-broken-fix.diff: outline numbering fix in master docs

i#96092, n#445536

sw/source/core/docnode/ndcopy.cxx |    2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

commit 7dd2e230f9de2676be07d094a837a0167e275194
Author: Florian Reuter <freuter@novell.com>
Date:   Tue Sep 14 16:12:59 2010 +0200

sw-import-html-controls.diff:

n#485609

sw/source/filter/ww8/ww8par.hxx  |    2 ++
sw/source/filter/ww8/ww8par3.cxx |    8 ++++++++
sw/source/filter/ww8/ww8par5.cxx |    2 +-
3 files changed, 11 insertions(+), 1 deletions(-)

commit 8208802eed76b29302c132dd0a0608cc71dd396f
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date:   Tue Sep 14 16:00:07 2010 +0200

field-patch-lock.diff: enhanced fields lock fix

sw/source/core/crsr/pam.cxx |   28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)

commit 7bd9bc8377047629a69450bf7d4c7dee67af517b
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date:   Tue Sep 14 15:58:16 2010 +0200

field-patch-uno-fix.diff: enhanced fields UNO fix

sw/source/core/unocore/unocoll.cxx |   18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)

commit d19c7c96ee03fccc41fb5a74128304bd432eac81
Author: Florian Reuter <freuter@novell.com>
Date:   Tue Sep 14 15:00:33 2010 +0200

sw-table-join-fix-i99267.diff:

n#417814

sw/source/core/layout/tabfrm.cxx |    5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)

commit 47472e8e70c1ae3dc55a5b00ef69eaa85f651a7f
Author: Florian Reuter <freuter@novell.com>
Date:   Tue Sep 14 14:40:15 2010 +0200

sw-collapse-empty-table-par-like-html.diff:

n#376690

sw/inc/IDocumentSettingAccess.hxx        |    1 +
sw/inc/doc.hxx                           |    1 +
sw/inc/ndtxt.hxx                         |    2 +
sw/source/core/crsr/callnk.cxx           |   50 ++++++++++++++++++++++++++++++
sw/source/core/doc/doc.cxx               |    4 ++
sw/source/core/doc/docnew.cxx            |    1 +
sw/source/core/inc/frame.hxx             |    4 ++
sw/source/core/layout/calcmove.cxx       |   43 +++++++++++++++++++++++++
sw/source/core/layout/findfrm.cxx        |    9 +++++
sw/source/core/text/frmpaint.cxx         |   34 +++++++++++---------
sw/source/core/text/porrst.cxx           |   16 +++++++++
sw/source/filter/ww8/ww8par.cxx          |    1 +
sw/source/filter/ww8/ww8par2.cxx         |   14 --------
sw/source/ui/uno/SwXDocumentSettings.cxx |   16 +++++++++-
14 files changed, 166 insertions(+), 30 deletions(-)

commit 440bab6daea191ddf18b019fb88600b82e11a0ed
Author: Florian Reuter <freuter@novell.com>
Date:   Tue Sep 14 14:36:01 2010 +0200

sw-invert-border-spacing.diff:

n#391591

sw/inc/IDocumentSettingAccess.hxx        |    1 +
sw/inc/doc.hxx                           |    1 +
sw/source/core/doc/doc.cxx               |    4 ++++
sw/source/core/doc/docnew.cxx            |    1 +
sw/source/core/layout/frmtool.cxx        |    9 +++++++--
sw/source/core/layout/paintfrm.cxx       |    2 +-
sw/source/filter/rtf/swparrtf.cxx        |    2 +-
sw/source/filter/ww8/ww8par.cxx          |    2 ++
sw/source/filter/ww8/ww8par6.cxx         |   17 +++++++++++++----
sw/source/ui/uno/SwXDocumentSettings.cxx |   18 +++++++++++++++---
10 files changed, 46 insertions(+), 11 deletions(-)

commit 70597695b23b5c45dfc735a7afd175f034428195
Author: Florian Reuter <freuter@novell.com>
Date:   Tue Sep 14 14:32:01 2010 +0200

sw-allow-negative-spacing.diff: correctly display linespacing < 100%

n#364534

sw/source/core/text/itrform2.cxx |   22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)

commit 998c642599c9196e2249fe35cf1450711fdd5d75
Author: Florian Reuter <freuter@novell.com>
Date:   Tue Sep 14 14:28:15 2010 +0200

sw-section-import-fix.diff: Additional paragraph imported from ww8

n#364533

sw/source/filter/ww8/ww8par.cxx |    7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)

commit 70561fdb1c47bc0bcfdbb97ffed28fe13ab556f8
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date:   Tue Sep 14 14:16:21 2010 +0200

g++44-debug.diff: Fixed some imports for debug more

sw/source/core/text/inftxt.cxx    |    4 ++++
sw/source/filter/ww8/WW8Sttbf.cxx |    4 ++++
sw/source/filter/ww8/wrtww8gr.cxx |    4 ++++
3 files changed, 12 insertions(+), 0 deletions(-)

commit 10c10ffa04a952c81e0a85e0606b46e2433705c3
Author: Thorsten Behrens <tbehrens@novell.com>
Date:   Tue Sep 14 13:12:33 2010 +0200

win32-vs2005-compat.diff: Fix build with Visual Studio 2005

sw/source/filter/ww8/wrtw8nds.cxx |    6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

commit 985b180a2fae4ffeaac83ead0a71e1e128db0f79
Author: Octavio Alvarez <alvarezp@alvarezp.ods.org>
Date:   Mon Sep 13 17:30:41 2010 +0200

sw-preserve-char-style-on-reset-format.diff:Perserve character style on links

i#47893

sw/source/ui/shells/textsh1.cxx |    2 --
1 files changed, 0 insertions(+), 2 deletions(-)

commit 46c042512344d9e714ea716efc8f707ede5e179b
Author: Octavio Alvarez <alvarezp@alvarezp.ods.org>
Date:   Mon Sep 13 17:26:19 2010 +0200

sw-show-Remove-Hyperlink-even-with-selection.diff:

sw/source/ui/shells/textsh1.cxx |   15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)

commit 1ccbb5d782056eeaf0c50333eed49ded73acfc5f
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date:   Mon Sep 13 17:15:50 2010 +0200

sw-rtf-num-fix.diff:Fixes for RTF numbering export

n#569266

sw/source/filter/rtf/rtfatr.cxx |   12 +++---
sw/source/filter/rtf/rtfnum.cxx |   78 ++++++++++++--------------------------
2 files changed, 31 insertions(+), 59 deletions(-)

commit 934cea09a95d7d638d09f881629579c568a30621
Author: Amelia Wang <amwang@novell.com>
Date:   Mon Sep 13 14:46:36 2010 +0200

cjk-character-units-in-pggrid-fix.diff: add a new character unit

sw/source/ui/inc/pggrid.hxx  |    1 +
sw/source/ui/misc/pggrid.cxx |   42 ++++++++++++++++++++++++++----------------
2 files changed, 27 insertions(+), 16 deletions(-)

commit dae07c66db3014b7f0eefada5e4ff8af8556e768
Author: Amelia Wang <amwang@novell.com>
Date:   Mon Sep 13 14:45:00 2010 +0200

cjk-character-units-fix-376788.diff: add a new character unit

i#376788

sw/source/ui/app/swmodul1.cxx   |   14 ++++++++++----
sw/source/ui/config/optload.cxx |    8 +++++---
sw/source/ui/misc/pggrid.cxx    |    4 ++--
sw/source/ui/uiview/view.cxx    |   36 ++++++++++++++++++++++++++++++------
4 files changed, 47 insertions(+), 15 deletions(-)

commit 6321ca557a2a188a3a3f8f6eeb2881f8e7eacce8
Author: Amelia Wang <amwang@novell.com>
Date:   Mon Sep 13 14:43:46 2010 +0200

cjk-character-units-fix.diff: add a new unit 'character unit'

i#356101

sw/source/ui/app/appopt.cxx     |    1 +
sw/source/ui/app/swmodul1.cxx   |    6 ++++--
sw/source/ui/config/optload.cxx |    3 +++
sw/source/ui/config/optload.src |    3 +--
sw/source/ui/config/usrpref.cxx |    3 ++-
sw/source/ui/misc/pggrid.cxx    |    6 +++---
sw/source/ui/uiview/view.cxx    |    6 ++++--
7 files changed, 18 insertions(+), 10 deletions(-)

commit 723b3fc153061b39604a032d578409d7f22d708f
Author: Amelia Wang <amwang@novell.com>
Date:   Mon Sep 13 14:42:44 2010 +0200

cjk-character-units-rulers-sync-with-pggrid-fix.diff:

sw/source/ui/inc/pggrid.hxx  |    2 ++
sw/source/ui/misc/pggrid.cxx |   24 ++++++++++++++++++++----
2 files changed, 22 insertions(+), 4 deletions(-)

commit baf4316376191dce3a3d070a07e745e0286b7bac
Author: Amelia Wang <amwang@novell.com>
Date:   Mon Sep 13 14:40:57 2010 +0200

cjk-character-units-ui.diff: add a new unit 'character unit'

sw/source/ui/config/optload.cxx |    6 ++++++
sw/source/ui/config/optload.hrc |    1 +
sw/source/ui/config/optload.src |   12 ++++++++++++
sw/source/ui/config/optpage.cxx |   23 +++++++++++++++++------
sw/source/ui/inc/optload.hxx    |    1 +
sw/source/ui/inc/pggrid.hxx     |    2 ++
sw/source/ui/misc/pggrid.cxx    |    3 +++
sw/source/ui/misc/pggrid.hrc    |    2 ++
sw/source/ui/misc/pggrid.src    |   12 ++++++++++++
9 files changed, 56 insertions(+), 6 deletions(-)

commit 4cd64c0c68b4c81406d0075ac9d846014538840b
Author: Amelia Wang <amwang@novell.com>
Date:   Mon Sep 13 14:37:51 2010 +0200

cjk-character-units-imp.diff: add a new unit 'character unit'

sw/inc/swmodule.hxx             |    2 +
sw/source/ui/app/appopt.cxx     |   10 +++++++
sw/source/ui/app/swmodul1.cxx   |   57 +++++++++++++++++++++++++++++++++++++++
sw/source/ui/config/optload.cxx |   17 +++++++++++
sw/source/ui/config/usrpref.cxx |   11 +++++---
sw/source/ui/inc/pggrid.hxx     |    2 +-
sw/source/ui/inc/uitool.hxx     |    3 ++
sw/source/ui/inc/usrpref.hxx    |   12 ++++++++
sw/source/ui/misc/pggrid.cxx    |   32 ++++++++++++++++++---
sw/source/ui/shells/textsh1.cxx |    4 +++
sw/source/ui/uiview/view.cxx    |   17 ++++++++++-
sw/source/ui/utlui/uitool.cxx   |   13 +++++++++
12 files changed, 168 insertions(+), 12 deletions(-)

commit 825b1706ab0a71d86812cbb95ac056e78f6a5864
Author: Jiao Jianhua <jjiao@novell.com>
Date:   Mon Sep 13 14:07:35 2010 +0200

plus-minus-sw-navigator2.diff: Folding for each heading in Navigator

i#64886, n#129410i

sw/source/ui/inc/conttree.hxx  |    5 +++
sw/source/ui/utlui/content.cxx |   74 +++++++++++++++++++++++++++++++++++++--
2 files changed, 75 insertions(+), 4 deletions(-)

commit c2b6b1ab7a949fb80fd98f506486d45a1166fbc5
Author: Jiao Jianhua <jjiao@novell.com>
Date:   Mon Sep 13 14:06:16 2010 +0200

plus-minus-sw-navigator.diff: folding for each heading in Navigator

i#64886, n#129410

sw/source/ui/utlui/content.cxx |  134 +++++++++++++++++++++++++++++++---------
1 files changed, 105 insertions(+), 29 deletions(-)

commit 290f7aba51f626e259764487fec8795ef6b4043a
Merge: d3ae4c6 4937fcb
Author: Jan Holesovsky <kendy@suse.cz>
Date:   Wed Sep 8 11:34:21 2010 +0200

Merge commit 'ooo/OOO330_m7'

commit d3ae4c683dda23722661cad8b5992586d2883bd0
Merge: e0b0ca3 17b62cb
Author: Jan Holesovsky <kendy@suse.cz>
Date:   Tue Sep 7 09:33:10 2010 +0200

Merge commit 'ooo/OOO330_m6'

commit 4937fcb1c4fa15194c01a79c57523d9a9333c710 (tag: refs/tags/ooo/OOO330_m7)
Merge: 17b62cb 3274d37
Author: Kurt Zenker <kz@openoffice.org>
Date:   Fri Sep 3 14:39:55 2010 +0200

CWS-TOOLING: integrate CWS fs33a

commit 17b62cb5acad25dc82a95a40d545e6af6a185f55 (tag: refs/tags/ooo/OOO330_m6)
Author: obo <obo@openoffice.org>
Date:   Fri Aug 27 13:02:34 2010 +0200

masterfix OOO330: #i10000# new exception file unovwr.cxx

sw/source/core/undo/makefile.mk |    1 +
1 files changed, 1 insertions(+), 0 deletions(-)

commit a3019ec68acb22c8f590ee104fd6e7aad20c4778
Merge: aa24f45 631d42d
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date:   Wed Aug 25 14:19:19 2010 +0200

CWS-TOOLING: integrate CWS sw33bf08

commit 631d42da043d690b931e3750176a3a295b376c7e
Author: Thomas Lange [tl] <tl@openoffice.org>
Date:   Tue Aug 17 16:46:36 2010 +0200

cws sw33bf08: #i113584#, #i113587# transliteration fixed

sw/inc/undobj.hxx                 |    6 +-
sw/source/core/doc/docedt.cxx     |   33 +++--
sw/source/core/txtnode/txtedt.cxx |  271 ++++++++++++++++++++++++++++++++-----
sw/source/core/undo/unovwr.cxx    |  136 +++++++++----------
4 files changed, 326 insertions(+), 120 deletions(-)

commit 3274d37826fc2613aa5061a985d1aab476e3a6fc
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date:   Fri Aug 13 23:34:21 2010 +0200

fs33a: make compile in non-pro build (removed seemingly dead assertion)

sw/source/ui/lingu/olmenu.cxx |    2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

commit 013feef7fc5add0b3468b2c3d11bea8d4f830174
Merge: db3cc71 aa24f45
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date:   Fri Aug 13 12:04:35 2010 +0200

fs33a: merge after pulling OOO330.m4's change sets

commit db3cc711f90a781bc8cd82a90d872f6e281ae205
Merge: e1a0f88 80200b9
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date:   Tue Aug 10 14:53:21 2010 +0200

merging in latest changes from OOO330(m3)

1 files changed, 105 insertions, 97 deletions

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index fd45279d4d13..d9d78107f6b2 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -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
@@ -79,21 +79,21 @@
 #include <swtable.hxx>
 #include <pam.hxx>
 #include <ndtxt.hxx>
-#include <swundo.hxx>           // fuer die UndoIds
+#include <swundo.hxx>			// fuer die UndoIds
 #include <undobj.hxx>
 #include <pagedesc.hxx> //DTor
 #include <breakit.hxx>
 #include <ndole.hxx>
 #include <ndgrf.hxx>
-#include <rolbck.hxx>           // Undo-Attr
-#include <doctxm.hxx>           // fuer die Verzeichnisse
+#include <rolbck.hxx>			// Undo-Attr
+#include <doctxm.hxx>			// fuer die Verzeichnisse
 #include <grfatr.hxx>
-#include <poolfmt.hxx>          // PoolVorlagen-Id's
-#include <mvsave.hxx>           // fuer Server-Funktionalitaet
+#include <poolfmt.hxx>			// PoolVorlagen-Id's
+#include <mvsave.hxx>			// fuer Server-Funktionalitaet
 #include <SwGrammarMarkUp.hxx>
 #include <scriptinfo.hxx>
-#include <acorrect.hxx>         // Autokorrektur
-#include <mdiexp.hxx>           // Statusanzeige
+#include <acorrect.hxx>			// Autokorrektur
+#include <mdiexp.hxx>	   		// Statusanzeige
 #include <docstat.hxx>
 #include <docary.hxx>
 #include <redline.hxx>
@@ -102,7 +102,7 @@
 #include <printdata.hxx>
 #include <swprtopt.hxx>
 #include <cmdid.h>              // fuer den dflt - Printer in SetJob
-#include <statstr.hrc>          // StatLine-String
+#include <statstr.hrc>      	// StatLine-String
 #include <comcore.hrc>
 #include <SwUndoTOXChange.hxx>
 #include <SwUndoFmt.hxx>
@@ -197,6 +197,8 @@ bool SwDoc::get(/*[in]*/ DocumentSettingId id) const
         // --> OD 2008-06-05 #i89181#
         case TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: return mbTabAtLeftIndentForParagraphsInList;
         // <--
+    case INVERT_BORDER_SPACING: return mbInvertBorderSpacing;
+        case COLLAPSE_EMPTY_CELL_PARA: return mbCollapseEmptyCellPara;
          // COMPATIBILITY FLAGS END
 
         case BROWSE_MODE: return mbBrowseMode;
@@ -320,6 +322,12 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value)
             mbTabAtLeftIndentForParagraphsInList = value;
         break;
         // <--
+    case INVERT_BORDER_SPACING:
+        mbInvertBorderSpacing = value;
+    break;
+        case COLLAPSE_EMPTY_CELL_PARA:
+            mbCollapseEmptyCellPara = value;
+         break;
          // COMPATIBILITY FLAGS END
 
         case BROWSE_MODE:
@@ -665,9 +673,9 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart )
         return false;
 
     {
-        // Bug 26675:   DataChanged vorm loeschen verschicken, dann bekommt
-        //          man noch mit, welche Objecte sich im Bereich befinden.
-        //          Danach koennen sie vor/hinter der Position befinden.
+        // Bug 26675:	DataChanged vorm loeschen verschicken, dann bekommt
+        //			man noch mit, welche Objecte sich im Bereich befinden.
+        //			Danach koennen sie vor/hinter der Position befinden.
         SwDataChanged aTmp( this, rPos, 0 );
     }
 
@@ -684,9 +692,9 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart )
     }
 
     //JP 28.01.97: Sonderfall fuer SplitNode am Tabellenanfang:
-    //              steht die am Doc/Fly/Footer/..-Anfang oder direkt
-    //              hinter einer Tabelle, dann fuege davor
-    //              einen Absatz ein
+    //				steht die am Doc/Fly/Footer/..-Anfang oder direkt
+    //				hinter einer Tabelle, dann fuege davor
+    //				einen Absatz ein
     if( bChkTableStart && !rPos.nContent.GetIndex() && pNode->IsTxtNode() )
     {
         ULONG nPrevPos = rPos.nNode.GetIndex() - 1;
@@ -834,7 +842,7 @@ bool SwDoc::InsertString( const SwPaM &rRg, const String &rStr,
 
     const SwPosition& rPos = *rRg.GetPoint();
 
-    if( pACEWord )                  // Aufnahme in die Autokorrektur
+    if( pACEWord )					// Aufnahme in die Autokorrektur
     {
         if( 1 == rStr.Len() && pACEWord->IsDeleted() )
         {
@@ -863,7 +871,7 @@ bool SwDoc::InsertString( const SwPaM &rRg, const String &rStr,
         }
     }
     else
-    {           // ist Undo und Gruppierung eingeschaltet, ist alles anders !
+    {			// ist Undo und Gruppierung eingeschaltet, ist alles anders !
         SwUndoInsert * pUndo = NULL; // #111827#
 
         // don't group the start if hints at the start should be expanded
@@ -1025,8 +1033,8 @@ SwFlyFrmFmt* SwDoc::InsertOLE(const SwPaM &rRg, const String& rObjName,
 }
 
 /*************************************************************************
-|*                SwDoc::GetFldType()
-|*    Beschreibung: liefert den am Doc eingerichteten Feldtypen zurueck
+|*				  SwDoc::GetFldType()
+|*	  Beschreibung: liefert den am Doc eingerichteten Feldtypen zurueck
 *************************************************************************/
 
 SwFieldType *SwDoc::GetSysFldType( const USHORT eWhich ) const
@@ -1037,7 +1045,7 @@ SwFieldType *SwDoc::GetSysFldType( const USHORT eWhich ) const
     return 0;
 }
 /*************************************************************************
- *             void SetDocStat( const SwDocStat& rStat );
+ *			   void SetDocStat( const SwDocStat& rStat );
  *************************************************************************/
 
 void SwDoc::SetDocStat( const SwDocStat& rStat )
@@ -1059,17 +1067,17 @@ struct _PostItFld : public _SetGetExpFld
         : _SetGetExpFld( rNdIdx, pFld, pIdx ) {}
 
     USHORT GetPageNo( const StringRangeEnumerator &rRangeEnum,
-            const std::set< sal_Int32 > &rPossiblePages,
+            const std::set< sal_Int32 > &rPossiblePages, 
             USHORT& rVirtPgNo, USHORT& rLineNo );
-
+    
     SwPostItField* GetPostIt() const
-    {
+    { 
         return (SwPostItField*) GetFld()->GetFld().GetFld();
     }
 };
 
 
-USHORT _PostItFld::GetPageNo(
+USHORT _PostItFld::GetPageNo( 
     const StringRangeEnumerator &rRangeEnum,
     const std::set< sal_Int32 > &rPossiblePages,
     /* out */ USHORT& rVirtPgNo, /* out */ USHORT& rLineNo )
@@ -1102,8 +1110,8 @@ USHORT _PostItFld::GetPageNo(
 }
 
 
-bool lcl_GetPostIts(
-    IDocumentFieldsAccess* pIDFA,
+bool lcl_GetPostIts( 
+    IDocumentFieldsAccess* pIDFA, 
     _SetGetExpFlds * pSrtLst )
 {
     bool bHasPostIts = false;
@@ -1140,9 +1148,9 @@ bool lcl_GetPostIts(
 }
 
 
-static void lcl_FormatPostIt(
-    IDocumentContentOperations* pIDCO,
-    SwPaM& aPam,
+static void lcl_FormatPostIt( 
+    IDocumentContentOperations* pIDCO, 
+    SwPaM& aPam, 
     SwPostItField* pField,
     bool bNewPage, bool bIsFirstPostIt,
     USHORT nPageNo, USHORT nLineNo )
@@ -1162,7 +1170,7 @@ static void lcl_FormatPostIt(
         pIDCO->SplitNode( *aPam.GetPoint(), false );
         pIDCO->SplitNode( *aPam.GetPoint(), false );
     }
-
+    
     String aStr( ViewShell::GetShellRes()->aPostItPage );
     aStr.AppendAscii(sTmp);
 
@@ -1179,7 +1187,7 @@ static void lcl_FormatPostIt(
     aStr.AppendAscii(sTmp);
     aStr += pField->GetPar1();
     aStr += ' ';
-    SvtSysLocale aSysLocale;
+    SvtSysLocale aSysLocale;    
     aStr += /*(LocaleDataWrapper&)*/aSysLocale.GetLocaleData().getDate( pField->GetDate() );
     pIDCO->InsertString( aPam, aStr );
 
@@ -1208,10 +1216,10 @@ static sal_Int32 lcl_GetPaperBin( const SwPageFrm *pStartFrm )
 
     return nRes;
 }
-
+    
 
 void SwDoc::CalculatePagesForPrinting(
-    /* out */ SwRenderData &rData,
+    /* out */ SwRenderData &rData, 
     const SwPrintUIOptions &rOptions,
     bool bIsPDFExport,
     sal_Int32 nDocPageCount )
@@ -1229,9 +1237,9 @@ void SwDoc::CalculatePagesForPrinting(
     bool bPrintRightPages   = bIsPDFExport ? true : rOptions.IsPrintRightPages();
     // #i103700# printing selections should not allow for automatic inserting empty pages
     bool bPrintEmptyPages   = bPrintSelection ? false : rOptions.IsPrintEmptyPages( bIsPDFExport );
-
+        
     Range aPages( 1, nDocPageCount );
-
+        
     MultiSelection aMulti( aPages );
     aMulti.SetTotalRange( Range( 0, RANGE_MAX ) );
     aMulti.Select( aPages );
@@ -1324,7 +1332,7 @@ void SwDoc::CalculatePagesForPrinting(
         }
     }
 
-
+    
     //
     // now that we have identified the valid pages for printing according
     // to the print settings we need to get the PageRange to use and
@@ -1341,7 +1349,7 @@ void SwDoc::CalculatePagesForPrinting(
     }
     else
     {
-        // PageContent :
+        // PageContent : 
         // 0 -> print all pages (default if aPageRange is empty)
         // 1 -> print range according to PageRange
         // 2 -> print selection
@@ -1352,9 +1360,9 @@ void SwDoc::CalculatePagesForPrinting(
             // note that printing selections is actually implemented by copying
             // the selection to a new temporary document and printing all of that one.
             // Thus for Writer "PrintContent" must never be 2.
-            // See SwXTextDocument::GetRenderDoc for evaluating if a selection is to be
+            // See SwXTextDocument::GetRenderDoc for evaluating if a selection is to be 
             // printed and for creating the temporary document.
-        }
+        }    
 
         // please note
     }
@@ -1369,16 +1377,16 @@ void SwDoc::CalculatePagesForPrinting(
 
     // get vector of pages to print according to PageRange and valid pages set from above
     // (result may be an empty vector, for example if the range string is not correct)
-    StringRangeEnumerator::getRangesFromString(
+    StringRangeEnumerator::getRangesFromString( 
             aPageRange, rData.GetPagesToPrint(),
             1, nDocPageCount, 0, &rData.GetValidPagesSet() );
 }
+    
 
-
-void SwDoc::UpdatePagesForPrintingWithPostItData(
-    /* out */ SwRenderData &rData,
+void SwDoc::UpdatePagesForPrintingWithPostItData( 
+    /* out */ SwRenderData &rData, 
     const SwPrintUIOptions &rOptions,
-    bool /*bIsPDFExport*/,
+    bool /*bIsPDFExport*/, 
     sal_Int32 nDocPageCount )
 {
 
@@ -1399,14 +1407,14 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
 
         const StringRangeEnumerator aRangeEnum( rData.GetPageRange(), 1, nDocPageCount, 0 );
 
-        // For mode POSTITS_ENDPAGE:
+        // For mode POSTITS_ENDPAGE: 
         // maps a physical page number to the page number in post-it document that holds
         // the first post-it for that physical page . Needed to relate the correct start frames
         // from the post-it doc to the physical page of the document
         std::map< sal_Int32, sal_Int32 >  aPostItLastStartPageNum;
 
         // add all post-its on valid pages within the the page range to the
-        // temporary post-it document.
+        // temporary post-it document. 
         // Since the array of post-it fileds is sorted by page and line number we will
         // already get them in the correct order
         USHORT nVirtPg = 0, nLineNo = 0, nLastPageNum = 0, nPhyPageNum = 0;
@@ -1415,7 +1423,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
         {
             _PostItFld& rPostIt = (_PostItFld&)*(*rData.m_pPostItFields)[ i ];
             nLastPageNum = nPhyPageNum;
-            nPhyPageNum = rPostIt.GetPageNo(
+            nPhyPageNum = rPostIt.GetPageNo( 
                     aRangeEnum, rData.GetValidPagesSet(), nVirtPg, nLineNo );
             if (nPhyPageNum)
             {
@@ -1424,46 +1432,46 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
                 // post-it page needs to start on a new page
                 const bool bNewPage = nPostItMode == POSTITS_ENDPAGE &&
                         !bIsFirstPostIt && nPhyPageNum != nLastPageNum;
-
+                
                 lcl_FormatPostIt( rData.m_pPostItShell->GetDoc(), aPam,
                         rPostIt.GetPostIt(), bNewPage, bIsFirstPostIt, nVirtPg, nLineNo );
                 bIsFirstPostIt = false;
-
+                
                 if (nPostItMode == POSTITS_ENDPAGE)
                 {
                     // get the correct number of current pages for the post-it document
                     rData.m_pPostItShell->CalcLayout();
                     const sal_Int32 nPages = rData.m_pPostItDoc->GetPageCount();
                     aPostItLastStartPageNum[ nPhyPageNum ] = nPages;
-                }
+                }    
             }
         }
-
+        
         // format post-it doc to get correct number of pages
         rData.m_pPostItShell->CalcLayout();
         const sal_Int32 nPostItDocPageCount = rData.m_pPostItDoc->GetPageCount();
 
         if (nPostItMode == POSTITS_ONLY || nPostItMode == POSTITS_ENDDOC)
         {
-            // now add those post-it pages to the vector of pages to print
+            // now add those post-it pages to the vector of pages to print 
             // or replace them if only post-its should be printed
-
+            
             rData.GetPostItStartFrames().clear();
             if (nPostItMode == POSTITS_ENDDOC)
             {
                 // set all values up to number of pages to print currently known to NULL,
-                // meaning none of the pages currently in the vector is from the
+                // meaning none of the pages currently in the vector is from the 
                 // post-it document, they are the documents pages.
                 rData.GetPostItStartFrames().resize( rData.GetPagesToPrint().size() );
-            }
+            }    
             else if (nPostItMode == POSTITS_ONLY)
             {
                 // no document page to be printed
                 rData.GetPagesToPrint().clear();
             }
-
+            
             // now we just need to add the post-it pages to be printed to the end
-            // of the vector of pages to print and keep the GetValidStartFrames
+            // of the vector of pages to print and keep the GetValidStartFrames 
             // data conform with it
             sal_Int32 nPageNum = 0;
             const SwPageFrm * pPageFrm = (SwPageFrm*)rData.m_pPostItShell->GetLayout()->Lower();
@@ -1477,7 +1485,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
                 pPageFrm = (SwPageFrm*)pPageFrm->GetNext();
             }
             DBG_ASSERT( nPageNum == nPostItDocPageCount, "unexpected number of pages" );
-        }
+        }    
         else if (nPostItMode == POSTITS_ENDPAGE)
         {
             // the next step is to find all the start frames from the post-it
@@ -1495,10 +1503,10 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
                 aAllPostItStartFrames.push_back( pPageFrm );
                 pPageFrm = (SwPageFrm*)pPageFrm->GetNext();
             }
-            DBG_ASSERT( sal_Int32(aAllPostItStartFrames.size()) == nPostItDocPageCount,
+            DBG_ASSERT( sal_Int32(aAllPostItStartFrames.size()) == nPostItDocPageCount, 
                     "unexpected number of frames; does not match number of pages" );
-
-            // get a map that holds all post-it frames to be printed for a
+            
+            // get a map that holds all post-it frames to be printed for a 
             // given physical page from the document
             sal_Int32 nLastStartPageNum = 0;
             std::map< sal_Int32, sal_Int32 >::const_iterator  aIt;
@@ -1513,7 +1521,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
                 for (sal_Int32 i = 0; i < nFrames; ++i)
                 {
                     const sal_Int32 nIdx = nFirstStartPageNum - 1 + i;   // -1 because lowest page num is 1
-                    DBG_ASSERT( 0 <= nIdx && nIdx < sal_Int32(aAllPostItStartFrames.size()),
+                    DBG_ASSERT( 0 <= nIdx && nIdx < sal_Int32(aAllPostItStartFrames.size()), 
                             "index out of range" );
                     aStartFrames.push_back( aAllPostItStartFrames[ nIdx ] );
                 }
@@ -1521,12 +1529,12 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
                 nLastStartPageNum = aIt->second;
             }
 
-
-            // ok, now that aPhysPageToPostItFrames can give the start frames for all
+            
+            // ok, now that aPhysPageToPostItFrames can give the start frames for all 
             // post-it pages to be printed we need to merge those at the correct
             // position into the GetPagesToPrint vector and build and maintain the
             // GetValidStartFrames vector as well.
-            // Since inserting a larger number of entries in the middle of a vector
+            // Since inserting a larger number of entries in the middle of a vector 
             // isn't that efficient we will create new vectors by copying the required data
             std::vector< sal_Int32 >            aTmpPagesToPrint;
             std::vector< const SwPageFrm * >    aTmpPostItStartFrames;
@@ -1537,7 +1545,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
                 const sal_Int32 nPhysPage = rData.GetPagesToPrint()[i];
                 aTmpPagesToPrint.push_back( nPhysPage );
                 aTmpPostItStartFrames.push_back( NULL );
-
+                
                 // add the post-it document pages to print, i.e those
                 // post-it pages that have the data for the above physical page
                 const std::vector< const SwPageFrm * > &rPostItFrames = aPhysPageToPostItFrames[ nPhysPage ];
@@ -1546,7 +1554,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
                 {
                     aTmpPagesToPrint.push_back( 0 );
                     aTmpPostItStartFrames.push_back( rPostItFrames[k] );
-                }
+                }    
             }
 
             // finally we need to assign those vectors to the resulting ones.
@@ -1554,13 +1562,13 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
             // we won't need the temporary vectors anymore
             rData.GetPagesToPrint().swap( aTmpPagesToPrint );
             rData.GetPostItStartFrames().swap( aTmpPostItStartFrames );
-        }
-    }
+        }    
+    }    
 }
+    
 
-
-void SwDoc::CalculatePagePairsForProspectPrinting(
-    /* out */ SwRenderData &rData,
+void SwDoc::CalculatePagePairsForProspectPrinting( 
+    /* out */ SwRenderData &rData, 
     const SwPrintUIOptions &rOptions,
     sal_Int32 nDocPageCount )
 {
@@ -1568,13 +1576,13 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
     std::set< sal_Int32 > &rValidPagesSet = rData.GetValidPagesSet();
     std::map< sal_Int32, const SwPageFrm * > &rValidStartFrms = rData.GetValidStartFrames();
     std::vector< std::pair< sal_Int32, sal_Int32 > > &rPagePairs = rData.GetPagePairsForProspectPrinting();
-
+    
     rPagePairs.clear();
     rValidPagesSet.clear();
     rValidStartFrms.clear();
 
     rtl::OUString aPageRange = rOptions.getStringValue( "PageRange", rtl::OUString() );
-    // PageContent :
+    // PageContent : 
     // 0 -> print all pages (default if aPageRange is empty)
     // 1 -> print range according to PageRange
     // 2 -> print selection
@@ -1599,7 +1607,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
     if ( !pStPage )          // dann wars das
         return;
 
-    // currently for prospect printing all pages are valid to be printed
+    // currently for prospect printing all pages are valid to be printed 
     // thus we add them all to the respective map and set for later use
     sal_Int32 nPageNum = 0;
     const SwPageFrm *pPageFrm = (SwPageFrm*)pLayout->Lower();
@@ -1623,11 +1631,11 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
     bool bPrintProspectRTL = rOptions.getIntValue( "PrintProspectRTL",  0 ) ? true : false;
 
     // get pages for prospect printing according to the 'PageRange'
-    // (duplicates and any order allowed!)
+    // (duplicates and any order allowed!) 
     std::vector< sal_Int32 > aPagesToPrint;
-    StringRangeEnumerator::getRangesFromString(
+    StringRangeEnumerator::getRangesFromString( 
             aPageRange, aPagesToPrint, 1, nDocPageCount, 0 );
-
+    
     // now fill the vector for calculating the page pairs with the start frames
     // from the above obtained vector
     std::vector< const SwPageFrm * > aVec;
@@ -1639,7 +1647,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
     }
 
     // just one page is special ...
-    if ( 1 == aVec.size() )
+    if ( 1 == aVec.size() )    
         aVec.insert( aVec.begin() + 1, 0 ); // insert a second empty page
     else
     {
@@ -1701,7 +1709,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
     }
     DBG_ASSERT( size_t(nCntPage) == rPagePairs.size(), "size mismatch for number of page pairs" );
 
-    // luckily prospect printing does not make use of post-its so far,
+    // luckily prospect printing does not make use of post-its so far, 
     // thus we are done here.
 }
 
@@ -1732,7 +1740,7 @@ const Size SwDoc::GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) const
 
 
 /*************************************************************************
- *            void UpdateDocStat( const SwDocStat& rStat );
+ *			  void UpdateDocStat( const SwDocStat& rStat );
  *************************************************************************/
 
 void SwDoc::UpdateDocStat( SwDocStat& rStat )
@@ -1750,10 +1758,10 @@ void SwDoc::UpdateDocStat( SwDocStat& rStat )
             case ND_TEXTNODE:
                 ((SwTxtNode*)pNd)->CountWords( rStat, 0, ((SwTxtNode*)pNd)->GetTxt().Len() );
                 break;
-            case ND_TABLENODE:      ++rStat.nTbl;   break;
-            case ND_GRFNODE:        ++rStat.nGrf;   break;
-            case ND_OLENODE:        ++rStat.nOLE;   break;
-            case ND_SECTIONNODE:    break;
+            case ND_TABLENODE:		++rStat.nTbl;	break;
+            case ND_GRFNODE:		++rStat.nGrf;	break;
+            case ND_OLENODE:		++rStat.nOLE;	break;
+            case ND_SECTIONNODE:	break;
             }
         }
 
@@ -1775,7 +1783,7 @@ void SwDoc::UpdateDocStat( SwDocStat& rStat )
             }
         }
 
-        rStat.nPage     = GetRootFrm() ? GetRootFrm()->GetPageNum() : 0;
+        rStat.nPage 	= GetRootFrm() ? GetRootFrm()->GetPageNum() : 0;
         rStat.bModified = FALSE;
         SetDocStat( rStat );
 
@@ -1878,7 +1886,7 @@ const SwFmtRefMark* SwDoc::GetRefMark( USHORT nIndex ) const
 
     // returne die Namen aller im Doc gesetzten Referenzen
     //JP 24.06.96: Ist der ArrayPointer 0 dann returne nur, ob im Doc. eine
-    //              RefMark gesetzt ist
+    //				RefMark gesetzt ist
     // OS 25.06.96: ab jetzt wird immer die Anzahl der Referenzen returnt
 USHORT SwDoc::GetRefMarks( SvStringsDtor* pNames ) const
 {
@@ -1959,8 +1967,8 @@ void SwDoc::SetModified()
     SwLayouter::ClearMoveBwdLayoutInfo( *this );
     // <--
     // dem Link wird der Status returnt, wie die Flags waren und werden
-    //  Bit 0:  -> alter Zustand
-    //  Bit 1:  -> neuer Zustand
+    // 	Bit 0:	-> alter Zustand
+    //	Bit 1: 	-> neuer Zustand
     long nCall = mbModified ? 3 : 2;
     mbModified = TRUE;
     pDocStat->bModified = TRUE;
@@ -1978,8 +1986,8 @@ void SwDoc::SetModified()
 void SwDoc::ResetModified()
 {
     // dem Link wird der Status returnt, wie die Flags waren und werden
-    //  Bit 0:  -> alter Zustand
-    //  Bit 1:  -> neuer Zustand
+    // 	Bit 0:	-> alter Zustand
+    //	Bit 1: 	-> neuer Zustand
     long nCall = mbModified ? 1 : 0;
     mbModified = FALSE;
     // If there is already a document statistic, we assume that
@@ -2053,14 +2061,14 @@ BOOL lcl_SpellAndGrammarAgain( const SwNodePtr& rpNd, void* pArgs )
 BOOL lcl_CheckSmartTagsAgain( const SwNodePtr& rpNd, void*  )
 {
     SwTxtNode *pTxtNode = (SwTxtNode*)rpNd->GetTxtNode();
-//  BOOL bOnlyWrong = *(BOOL*)pArgs;
+//	BOOL bOnlyWrong = *(BOOL*)pArgs;
     if( pTxtNode )
     {
         pTxtNode->SetSmartTagDirty( true );
         if( pTxtNode->GetSmartTags() )
         {
 //            if ( bOnlyWrong ) // only some smart tag types have been enabled or disabled
-//              pTxtNode->GetSmartTags()->SetInvalid( 0, STRING_LEN );
+//				pTxtNode->GetSmartTags()->SetInvalid( 0, STRING_LEN );
 //            else // smart tags all have been enabled or disabled
                 pTxtNode->SetSmartTags( NULL );
         }
@@ -2070,7 +2078,7 @@ BOOL lcl_CheckSmartTagsAgain( const SwNodePtr& rpNd, void*  )
 
 
 /*************************************************************************
- *      SwDoc::SpellItAgainSam( BOOL bInvalid, BOOL bOnlyWrong )
+ * 		SwDoc::SpellItAgainSam( BOOL bInvalid, BOOL bOnlyWrong )
  *
  * stoesst das Spelling im Idle-Handler wieder an.
  * Wird bInvalid als TRUE uebergeben, so werden zusaetzlich die WrongListen
@@ -2188,7 +2196,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, BYTE nLevel, BYTE nPara, BOOL bImpress )
         {
             SwNode *pNode;
             BOOL bDelete = FALSE;
-            if( (pNode = &aIndx.GetNode())->IsTxtNode() )
+            if(	(pNode = &aIndx.GetNode())->IsTxtNode() )
             {
                 SwTxtNode *pNd = (SwTxtNode*)pNode;
                 if( pNd->HasSwAttrSet() )
@@ -2458,7 +2466,7 @@ BOOL SwDoc::ConvertFieldsToText()
                     SwPaM aPam2(*pTxtFld->GetpTxtNode(), *pTxtFld->GetStart());
                     aPam2.SetMark();
                     aPam2.Move();
-                    DeleteAndJoin(aPam2);//remove the field
+                    DeleteAndJoin(aPam2);//remove the field 
                 }
             }
             ++aBegin;
@@ -2540,7 +2548,7 @@ bool SwDoc::EmbedAllLinks()
                         rLnkMgr.Remove( xLink );
 
                     if( nCount != rLnks.Count() + 1 )
-                        n = 0;      // wieder von vorne anfangen, es wurden
+                        n = 0;		// wieder von vorne anfangen, es wurden
                                     // mehrere Links entfernt
                     bRet = TRUE;
                 }